Re: [Breakage] Git v2.21.0-rc0 - t5403 (NonStop)

2019-02-08 Thread Todd Zullinger
[-cc: linux-kernel & git-packagers] SZEDER Gábor wrote: > On Fri, Feb 08, 2019 at 03:11:29PM -0500, Todd Zullinger wrote: >> It made me wonder how I had missed it in my own testing. >> This one requires SHELL_PATH to be bash, while I only set >> TEST_SHELL_PATH to bash for the improved -x tracing

Re: [PATCH] Add support for 'git remote rm' in Bash completion script

2019-02-08 Thread Todd Zullinger
Hi Sergey, There was a previous discussion of this in December 2017, which might be useful: https://public-inbox.org/git/01020160a0004473-277c3d7c-4e3b-4c50-9d44-4a106f37f1d9-000...@eu-west-1.amazonses.com/ It didn't end with a patch applied, but it's likely worth reading to help you make a case

Re: [PATCH v2 18/19] completion: support switch

2019-02-08 Thread Duy Nguyen
On Fri, Feb 8, 2019 at 9:19 PM SZEDER Gábor wrote: > > On Fri, Feb 08, 2019 at 04:04:00PM +0700, Nguyễn Thái Ngọc Duy wrote: > > Completion support for --guess could be made better. If no --detach is > > given, we should only provide a list of refs/heads/* and dwim ones, > > not the entire ref spa

[PATCH] Add support for 'git remote rm' in Bash completion script

2019-02-08 Thread Sergey Zolotarev
--- contrib/completion/git-completion.bash | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 499e56f83d..fa25d689e2 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/complet

Re: could not freshen shared index ..../sharedindex.0000000000000000000000000000000000000000'

2019-02-08 Thread Duy Nguyen
On Fri, Feb 8, 2019 at 11:39 PM Luke Diamand wrote: > > On Fri, 8 Feb 2019 at 10:02, Duy Nguyen wrote: > > > > On Wed, Feb 06, 2019 at 10:25:25AM +, Luke Diamand wrote: > > > I've recently started seeing a lot of this message when doing a rebase: > > > > > >warning: could not freshen shar

Re: could not freshen shared index ..../sharedindex.0000000000000000000000000000000000000000'

2019-02-08 Thread Duy Nguyen
On Sat, Feb 9, 2019 at 12:24 AM Junio C Hamano wrote: > > Duy Nguyen writes: > > > On Wed, Feb 06, 2019 at 10:25:25AM +, Luke Diamand wrote: > >> I've recently started seeing a lot of this message when doing a rebase: > >> > >>warning: could not freshen shared index > >> '/home/ldiamand/g

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 05:53:53PM -0500, Randall S. Becker wrote: > > diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index > > 92cf8f812c..4afab14431 100644 > > --- a/t/test-lib-functions.sh > > +++ b/t/test-lib-functions.sh > > @@ -1302,3 +1302,8 @@ test_set_port () { > > por

Re: [Possible Breakage] t1308 - Bad return value from test-tool

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 04:42:19PM -0500, Randall S. Becker wrote: > t1308 has me perplexed - this is an old breakage on the NonStop platform, > that I have just gotten around to checking with the new bash version we > have. When running sub-test 23, the following was reported: > > Value not foun

[PATCH v2] git-compat-util: undefine fileno if defined

2019-02-08 Thread Dan McGregor
Commit 8dd2e88a92 ("http: support file handles for HTTP_KEEP_ERROR", 2019-01-10) introduced an implicit assumption that rewind, fileno, and fflush are functions. At least on FreeBSD fileno is not, and as such passing a void * failed. All systems tested (FreeBSD and NetBSD) that define fineo as a m

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread brian m. carlson
On Fri, Feb 08, 2019 at 03:12:22PM -0800, Junio C Hamano wrote: > "brian m. carlson" writes: > > > +test_lazy_prereq NO_BOM ' > > + printf abc | iconv -f UTF-8 -t UTF-16 && > > + test $(wc -c) = 6 > > +' > > This must be "just for illustration of idea" patch? The pipeline > goes to the stan

Re: [PATCH v1 1/3] read-cache: add post-indexchanged hook

2019-02-08 Thread brian m. carlson
On Fri, Feb 08, 2019 at 02:51:13PM -0500, Ben Peart wrote: > From: Ben Peart > > Add a post-indexchanged hook that is invoked after the index is written in > do_write_locked_index(). > > This hook is meant primarily for notification, and cannot affect > the outcome of git commands that trigger t

Re: [PATCH v4 3/3] submodule: teach set-branch subcommand

2019-02-08 Thread Denton Liu
On Fri, 8 Feb 2019 at 03:21, Denton Liu wrote: > This teaches git-submodule the set-branch subcommand which allows the > branch of a submodule to be set through a porcelain command without > having to manually manipulate the .gitmodules file. > --- Sorry Junio, I forgot to attach my sign-off to t

Re: [Fix v2] t5562: remove dependency on /dev/zero

2019-02-08 Thread Junio C Hamano
randall.s.bec...@rogers.com writes: > From: "Randall S. Becker" > > Replaced subtest 15 (CONTENT_LENGTH overflow ssite_t) use of /dev/zero > with yes and a translation of its result to a stream of NULL. This is > a more portable solution. > > Signed-off-by: Randall S. Becker > --- > t/t5562-htt

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread Junio C Hamano
"brian m. carlson" writes: > +test_lazy_prereq NO_BOM ' > + printf abc | iconv -f UTF-8 -t UTF-16 && > + test $(wc -c) = 6 > +' This must be "just for illustration of idea" patch? The pipeline goes to the standard output, and nobody feeds "wc". But I think I got the idea. In the real

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 17:35, Jeff King wrote: > On Fri, Feb 08, 2019 at 05:12:43PM -0500, Randall S. Becker wrote: > > On February 8, 2019 17:07, brian m. carlson wrote: > > > On Fri, Feb 08, 2019 at 02:31:57PM -0500, Jeff King wrote: > > > > > It is available AFAIK on Linux, POSIX, and Windows under

Re: [PATCH 1/1] mingw: fix CPU reporting in `git version --build-options`

2019-02-08 Thread Eric Sunshine
On Thu, Feb 7, 2019 at 5:46 AM Johannes Schindelin via GitGitGadget wrote: > We cannot rely on `uname -m` in Git for Windows' SDK to tell us what > architecture we are compiling for, as we can compile both 32-bit and > 64-bit `git.exe` from a 64-bit SDK, but the `uname -m` in that SDK will > alway

Re: [Fix v2] t5562: remove dependency on /dev/zero

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 05:07:51PM -0500, randall.s.bec...@rogers.com wrote: > From: "Randall S. Becker" > > Replaced subtest 15 (CONTENT_LENGTH overflow ssite_t) use of /dev/zero > with yes and a translation of its result to a stream of NULL. This is > a more portable solution. They're NULs, n

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 17:19, brian m. carlson wrote: > On Fri, Feb 08, 2019 at 05:12:43PM -0500, Randall S. Becker wrote: > > I'm happy to modify the test (it is in one spot), to make a decision based > on: > > a) whether /dev/zero exists > > b) whether the system is a NonStop > > c) something else >

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 05:12:43PM -0500, Randall S. Becker wrote: > On February 8, 2019 17:07, brian m. carlson wrote: > > On Fri, Feb 08, 2019 at 02:31:57PM -0500, Jeff King wrote: > > > > It is available AFAIK on Linux, POSIX, and Windows under Cygwin. > > > > That's more than /dev/zero has any

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread brian m. carlson
On Fri, Feb 08, 2019 at 05:12:43PM -0500, Randall S. Becker wrote: > I'm happy to modify the test (it is in one spot), to make a decision based on: > a) whether /dev/zero exists > b) whether the system is a NonStop > c) something else > > What would you all prefer? It doesn't matter to me one way

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 17:07, brian m. carlson wrote: > On Fri, Feb 08, 2019 at 02:31:57PM -0500, Jeff King wrote: > > > It is available AFAIK on Linux, POSIX, and Windows under Cygwin. > > > That's more than /dev/zero has anyway. I have the patch ready if you > > > want it. > > > > Is it POSIX? Certa

[Fix v2] t5562: remove dependency on /dev/zero

2019-02-08 Thread randall . s . becker
From: "Randall S. Becker" Replaced subtest 15 (CONTENT_LENGTH overflow ssite_t) use of /dev/zero with yes and a translation of its result to a stream of NULL. This is a more portable solution. Signed-off-by: Randall S. Becker --- t/t5562-http-backend-content-length.sh | 4 ++-- 1 file changed,

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread brian m. carlson
On Fri, Feb 08, 2019 at 02:31:57PM -0500, Jeff King wrote: > > It is available AFAIK on Linux, POSIX, and Windows under Cygwin. > > That's more than /dev/zero has anyway. I have the patch ready if you > > want it. > > Is it POSIX? Certainly truncate() is, but I didn't think the > command-line tool

RE: [Fix v1] t5562: remove dependency on /dev/zero

2019-02-08 Thread Randall S. Becker
Please disregard this.. I left garbage inside. > -Original Message- > From: git-ow...@vger.kernel.org On Behalf > Of randall.s.bec...@rogers.com > Sent: February 8, 2019 16:59 > To: git@vger.kernel.org > Cc: Randall S. Becker > Subject: [Fix v1] t5562: remove dependency on /dev/zero > >

[Fix v1] t5562: remove dependency on /dev/zero

2019-02-08 Thread randall . s . becker
From: "Randall S. Becker" Replaced subtest 15 (CONTENT_LENGTH overflow ssite_t) use of /dev/zero with yes and a translation of its result to a stream of NULL. This is a more portable solution. Signed-off-by: Randall S. Becker --- t/t5562-http-backend-content-length.sh | 6 -- 1 file change

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 16:01, Jeff King wrote: > On Fri, Feb 08, 2019 at 03:38:05PM -0500, Randall S. Becker wrote: > > > > Exactly (if we even care about them being NULs; otherwise, we can > > > omit the "tr" invocation). > > > > I'm a bit perplexed about this... Obviously added some debugging info,

[Possible Breakage] t1308 - Bad return value from test-tool

2019-02-08 Thread Randall S. Becker
t1308 has me perplexed - this is an old breakage on the NonStop platform, that I have just gotten around to checking with the new bash version we have. When running sub-test 23, the following was reported: Value not found for "foo.bar" test_expect_code: command exited with 1, we wanted 2 test-tool

Re: [PATCH v2] pack-refs: fail on falsely sorted packed-refs

2019-02-08 Thread Eric Sunshine
On Fri, Feb 8, 2019 at 4:22 PM Max Kirillov wrote: > If packed-refs is marked as sorted but not really sorted it causes > very hard to comprehend misbehavior of reference resolving - a reference > is reported as not found, though it is listed by commands which output > the references list. > > As

[PATCH v2] pack-refs: fail on falsely sorted packed-refs

2019-02-08 Thread Max Kirillov
If packed-refs is marked as sorted but not really sorted it causes very hard to comprehend misbehavior of reference resolving - a reference is reported as not found, though it is listed by commands which output the references list. As the scope of the issue is not clear, make it visible by failing

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Jeff King
[-cc kernel and packagers; this is really just git development at this point] On Fri, Feb 08, 2019 at 03:38:05PM -0500, Randall S. Becker wrote: > > Exactly (if we even care about them being NULs; otherwise, we can omit the > > "tr" invocation). > > I'm a bit perplexed about this... Obviously ad

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread brian m. carlson
On Fri, Feb 08, 2019 at 09:23:36PM +0100, Kevin Daudt wrote: > Firstly, the tests expect iconv -t UTF-16 to output a BOM, which it > indeed does not do on Alpine. Secondly, git itself also expects the BOM > to be present when the encoding is set to UTF-16, otherwise it will > complain. Yeah, we de

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
> -Original Message- > From: Jeff King > Sent: February 8, 2019 14:32 > To: Randall S. Becker > Cc: 'Junio C Hamano' ; git@vger.kernel.org; 'Linux > Kernel' ; git-packag...@googlegroups.com > Subject: Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop) > > On Fri, Feb 08, 2019 at 02:26:1

Re: [PATCH 1/2] t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt

2019-02-08 Thread SZEDER Gábor
On Fri, Feb 08, 2019 at 03:25:05PM -0500, Todd Zullinger wrote: > SZEDER Gábor wrote: > > On Thu, Feb 07, 2019 at 10:17:45PM -0500, Todd Zullinger wrote: > >> When gpgsm is installed, lib-gpg.sh attempts to update trustlist.txt to > >> relax the checking of some root certificate requirements. The

Re: [PATCH 1/2] t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt

2019-02-08 Thread Todd Zullinger
SZEDER Gábor wrote: > On Thu, Feb 07, 2019 at 10:17:45PM -0500, Todd Zullinger wrote: >> When gpgsm is installed, lib-gpg.sh attempts to update trustlist.txt to >> relax the checking of some root certificate requirements. The path to >> "${GNUPGHOME}" contains spaces which cause an "ambiguous redi

Re: [Breakage] Git v2.21.0-rc0 - t5403 (NonStop)

2019-02-08 Thread SZEDER Gábor
On Fri, Feb 08, 2019 at 03:11:29PM -0500, Todd Zullinger wrote: > It made me wonder how I had missed it in my own testing. > This one requires SHELL_PATH to be bash, while I only set > TEST_SHELL_PATH to bash for the improved -x tracing in the > fedora builds. Note that you don't need Bash to use

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread Kevin Daudt
On Fri, Feb 08, 2019 at 09:50:07AM -0800, Junio C Hamano wrote: > "brian m. carlson" writes: > > >> So would you suggest that we just skip this test on Alpine Linux? > > > > That's not exactly what I said. If Alpine Linux users are never going to > > use this functionality and don't care that it'

Re: [PATCHv2] git-p4: ticket expiry test: use a fake p4 to avoid use of 'sleep'

2019-02-08 Thread SZEDER Gábor
On Fri, Feb 08, 2019 at 07:02:31PM +, Luke Diamand wrote: > +# create a fake version of "p4" which returns a TicketExpiration based > +# on $EXPIRY, for testing login expiration > +create_fake_p4() { > + ( > + cd "$git" && mkdir expire-p4 && > + cat >>expire-p4/p4 <<

Re: New command/tool: git filter-repo

2019-02-08 Thread Johannes Schindelin
Hi Ævar, On Fri, 8 Feb 2019, Ævar Arnfjörð Bjarmason wrote: > [...] > > But perhaps there's ways we can in advance deal with a potential > future breaking API change. E.g. some Pythonic way of versioning the > API, or just prominently documenting whatever (low?) stability > guarantees we'

Re: [PATCH 1/2] t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt

2019-02-08 Thread SZEDER Gábor
On Thu, Feb 07, 2019 at 10:17:45PM -0500, Todd Zullinger wrote: > When gpgsm is installed, lib-gpg.sh attempts to update trustlist.txt to > relax the checking of some root certificate requirements. The path to > "${GNUPGHOME}" contains spaces which cause an "ambiguous redirect" > warning when bash

Re: [Breakage] Git v2.21.0-rc0 - t5403 (NonStop)

2019-02-08 Thread Todd Zullinger
SZEDER Gábor wrote: > On Fri, Feb 08, 2019 at 05:48:27AM -0500, Randall S. Becker wrote: >> We have a few new breakages on the NonStop port in 2.21.0-rc0. The first is >> in t5403, as below: [...] >> The post-checkout hook is: >> #!/usr/local/bin/bash >> echo "$@" >$GIT_DIR/post-checkout.args >>

Re: [Fix v1] t5403: correct bash ambiguous redirect error in subtest 8 by quoting $GIT_DIR

2019-02-08 Thread Junio C Hamano
randall.s.bec...@rogers.com writes: > From: "Randall S. Becker" > > The embedded blanks in the full path of the test git repository cased bash > to generate an ambugious redirect error. > > Signed-off-by: Randall S. Becker > --- Thanks. > t/t5403-post-checkout-hook.sh | 2 +- > 1 file changed

Re: t5570-git-daemon fails with SIGPIPE on OSX

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 10:28:12AM +0100, Johannes Schindelin wrote: > Hi Peff, > > On Fri, 8 Feb 2019, Johannes Schindelin wrote: > > > I just had a look at the patch you provided below (for some reason, my > > previous search on public-inbox only turned up Gábor's mail to which you > > respond

[PATCH v1 2/3] read-cache: add test for post-indexchanged hook

2019-02-08 Thread Ben Peart
From: Ben Peart Test the new post-indexchanged hook and ensure it is triggered and passes the correct flags for various git commands. Signed-off-by: Ben Peart --- t/t7113-post-index-changed-hook.sh | 144 + 1 file changed, 144 insertions(+) create mode 100755 t/t71

[PATCH v1 0/3] Add post-indexchanged hook

2019-02-08 Thread Ben Peart
From: Ben Peart Add a post-indexchanged hook that is invoked after the index is written in do_write_locked_index(). This hook is meant primarily for notification, and cannot affect the outcome of git commands that trigger the index write. VFSForGit uses this hook to be notified when a git comma

[PATCH v1 1/3] read-cache: add post-indexchanged hook

2019-02-08 Thread Ben Peart
From: Ben Peart Add a post-indexchanged hook that is invoked after the index is written in do_write_locked_index(). This hook is meant primarily for notification, and cannot affect the outcome of git commands that trigger the index write. Signed-off-by: Ben Peart --- builtin/reset.c|

[PATCH v1 3/3] read-cache: Add documentation for the post-indexchanged hook

2019-02-08 Thread Ben Peart
From: Kevin Willford Document the new post-indexchanged hook with information on when it is called as well as the flags passed and what each of them mean. Signed-off-by: Kevin Willford Signed-off-by: Ben Peart --- Documentation/githooks.txt | 18 ++ 1 file changed, 18 insertio

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 02:26:17PM -0500, Randall S. Becker wrote: > > > For this, we could use truncate -s count file instead of dd to get a > > > fixed size file of nulls. This would remove the need for /dev/zero in > > > t5318 (the patch below probably will wrap badly in my mailer so I can > >

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Junio C Hamano
Johannes Sixt writes: > If the data does not have to be a sequence of zero bytes, the > alternatives are: > > * `test-genrandom seed-string $size` for a sequence of reproducible > "random" bytes > > * `printf "%0*d" $size 0` for a sequence of '0' characters. > > In t5318, the zero bytes do matter

[Proposed Fix v1] t5318: replace dd if=/dev/zero with truncate

2019-02-08 Thread randall . s . becker
From: "Randall S. Becker" The corrupt_graph_and_verify method has been modified to use truncate instead of the /dev/zero pseudo-device, which breaks on platforms where the pseudo-device does not exist. truncate extends files to a specified length filling with nulls, providing a similar function t

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 14:15, Jeff King wrote: > On Fri, Feb 08, 2019 at 01:47:04PM -0500, Randall S. Becker wrote: > > > > Though I suspect we may be able to just find a solution that works > > > everywhere, without having two different implementations. If we know > > > we need $count bytes for dd,

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 01:47:04PM -0500, Randall S. Becker wrote: > > Though I suspect we may be able to just find a solution that works > > everywhere, without having two different implementations. If we know we > > need $count bytes for dd, we could probably just generate a file with that > > m

Re: [PATCH] test-lib: make '--stress' more bisect-friendly

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 07:33:07PM +0100, SZEDER Gábor wrote: > On Fri, Feb 08, 2019 at 11:49:37AM -0500, Jeff King wrote: > > One other thing I've noticed with it: I forget to add my custom > > --root=/var/ram/git-tests when I invoke it, so my hard disk goes > > crazy (and the tests often r

Re: [PATCH 1/1] .mailmap: map Clemens Buchacher's mail addresses

2019-02-08 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > We have three email addresses for Clemens in our commit history, two of > them bouncing. Let's map the latter to the only one that still works. > > Pointed out by Gábor Szeder. > > Signed-off-by: Johannes Schindelin

Re: [PATCH] test-lib: make '--stress' more bisect-friendly

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 07:23:19PM +0100, SZEDER Gábor wrote: > > Picking an is tough. Too low and you get a false negative, too high > > and you can wait forever, especially if the script is long. But I don't > > think there's any real way to auto-scale it, except by seeing a few of > > the fail

[PATCHv2] git-p4: ticket expiry test: use a fake p4 to avoid use of 'sleep'

2019-02-08 Thread Luke Diamand
From: Luke Diamand This tests for p4 ticket expiry by creating a ticket, and then waiting long enough for the ticket to nearly expire. However, this is unreliable. Instead, create a 'fake' p4 which returns expiry times under the control of the test script, and forwards other commands to the real

Re: New command/tool: git filter-repo

2019-02-08 Thread Ævar Arnfjörð Bjarmason
On Thu, Jan 31 2019, Elijah Newren wrote: > What's the future? (Core command of git.git? place it in contrib? keep it > in a separate repo?) I'm hoping to discuss that at the contributor summit > today, but feedback on the list is also welcome. Some of this I may have mentioned at the summi

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 13:03, Jeff King wrote: > To: Randall S. Becker > Cc: 'Junio C Hamano' ; git@vger.kernel.org; 'Linux > Kernel' ; git-packag...@googlegroups.com > Subject: Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop) > > On Fri, Feb 08, 2019 at 12:49:59PM -0500, Randall S. Becker wrote: >

Re: [PATCH v3 0/3] Teach submodule set-branch subcommand

2019-02-08 Thread Junio C Hamano
Denton Liu writes: > By the way, just for the record, how would you like me to handle > patchsets that cause merge conflicts? When it happens, I may ask you to rebase onto a specific commit. https://public-inbox.org/git/xmqq5ztxstkh@gitster-ct.c.googlers.com/ is a recent example. My prefere

Re: [PATCH] test-lib: make '--stress' more bisect-friendly

2019-02-08 Thread SZEDER Gábor
On Fri, Feb 08, 2019 at 11:49:37AM -0500, Jeff King wrote: > One other thing I've noticed with it: I forget to add my custom > --root=/var/ram/git-tests when I invoke it, so my hard disk goes > crazy (and the tests often run slower!). I'm not sure if there's a > convenient fix. OTOH, that

[PATCH v2] reflog: specify default pretty format in config

2019-02-08 Thread Roland Hieber
The output of git-reflog(1) is currently only customisable by calling reflog with --pretty=... or overriding the "pretty.oneline" format in the config, which is currently the default fallback. To enhance flexibility and save typing, teach reflog to fall back to a default format specified in the co

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Johannes Sixt
Am 08.02.19 um 19:03 schrieb Jeff King: > On Fri, Feb 08, 2019 at 12:49:59PM -0500, Randall S. Becker wrote: >> Would you object to something like this: >> >> if [ ! -e /dev/zero ]; then >> # use shred or some other mechanism (still trying to figure out a >> solution) >> else >> # existi

Re: [PATCH] test-lib: make '--stress' more bisect-friendly

2019-02-08 Thread SZEDER Gábor
On Fri, Feb 08, 2019 at 11:47:33AM -0500, Jeff King wrote: > On Fri, Feb 08, 2019 at 12:50:45PM +0100, SZEDER Gábor wrote: > > > - Make it exit with failure if a failure is found. > > > > - Add the '--stress-limit=' option to repeat the test script > > at most N times in each of the paral

Re: undefined symbols building GIT source from githu

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 01:13:04AM -0500, Douglas Godfrey wrote: > make > > ld: warning: in libgit.a, file was built for unsupported file format which is > not the architecture being linked (x86_64) > ld: warning: in xdiff/lib.a, file was built for unsupported file format which > is not the arc

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-08 Thread Junio C Hamano
Henning Schild writes: > both patches look good to me. Killing the agent once should be enough, > i remember manually killing it many times as i was looking for a way to > generate certs and trust (configure gpgsm for the test). That is > probably why i copied it over in the first place. Thanks,

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 12:49:59PM -0500, Randall S. Becker wrote: > > We did discuss this at the time of the patch, but it seems we already use > > /dev/zero in a bunch of places: > > > > https://public-inbox.org/git/xmqqbm57rkg5@gitster-ct.c.googlers.com/ > > > > Were you just skipping t

Re: [PATCH v5 1/2] log,diff-tree: add --combined-all-paths option

2019-02-08 Thread Junio C Hamano
Elijah Newren writes: > On Thu, Feb 7, 2019 at 8:00 PM Junio C Hamano wrote: >> >> Elijah Newren writes: >> >> > +For `-c` and `--cc`, only the destination or final path is shown even >> > +if the file was renamed on any side of history. With >> > +`--combined-all-paths`, the name of the path

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 11:51, Jeff King wrote: > On Fri, Feb 08, 2019 at 06:08:33AM -0500, Randall S. Becker wrote: > > > t5318 is rather problematic and I have no good way to fix this. There > > is no /dev/zero on the platform, and the corrupt_graph_and_verify > > hard-codes if=/dev/zero, which is a

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread Junio C Hamano
"brian m. carlson" writes: >> So would you suggest that we just skip this test on Alpine Linux? > > That's not exactly what I said. If Alpine Linux users are never going to > use this functionality and don't care that it's broken, then that's a > fine solution. > > As originally mentioned, musl c

Re: Possible minor bug in Git

2019-02-08 Thread Torsten Bögershausen
On Fri, Feb 08, 2019 at 04:18:23PM +0100, Giuseppe Crinò wrote: > OK, I successfully built git on Windows (thanks Johannes!) and I'm now able > to run it. > > As of 9f16cdd I can successfully reproduce the bug. > > Interestingly enough, I can reproduce the bug even for /usr/bin/git running > insi

Re: [PATCH] ci: make sure we build Git parallel

2019-02-08 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Thu, 7 Feb 2019, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> >> >> >> +# Clear MAKEFLAGS that may come from the outside world. >> >> +export MAKEFLAGS= >> >> + >> ... >> I meant to clear it at the beginning, where I "export MAKEF

Re: could not freshen shared index ..../sharedindex.0000000000000000000000000000000000000000'

2019-02-08 Thread Junio C Hamano
Duy Nguyen writes: > On Wed, Feb 06, 2019 at 10:25:25AM +, Luke Diamand wrote: >> I've recently started seeing a lot of this message when doing a rebase: >> >>warning: could not freshen shared index >> '/home/ldiamand/git/dev_full/.git/worktrees/gcc8-take-2/sharedindex.00

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 06:08:33AM -0500, Randall S. Becker wrote: > t5318 is rather problematic and I have no good way to fix this. There > is no /dev/zero on the platform, and the corrupt_graph_and_verify > hard-codes if=/dev/zero, which is a linux-specific pseudo device. > Please provide a more

Re: [PATCH] test-lib: make '--stress' more bisect-friendly

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 11:47:33AM -0500, Jeff King wrote: > > This is a case when an external stress script works better, as it can > > easily check commits in the past... if someone has such a script, > > that is. > > Heh, I literally just implemented this kind of max-count in my own > "stress

Re: [PATCH] test-lib: make '--stress' more bisect-friendly

2019-02-08 Thread Jeff King
On Fri, Feb 08, 2019 at 12:50:45PM +0100, SZEDER Gábor wrote: > - Make it exit with failure if a failure is found. > > - Add the '--stress-limit=' option to repeat the test script > at most N times in each of the parallel jobs, and exit with > success when the limit is reached. > [...

Re: could not freshen shared index ..../sharedindex.0000000000000000000000000000000000000000'

2019-02-08 Thread Luke Diamand
On Fri, 8 Feb 2019 at 10:02, Duy Nguyen wrote: > > On Wed, Feb 06, 2019 at 10:25:25AM +, Luke Diamand wrote: > > I've recently started seeing a lot of this message when doing a rebase: > > > >warning: could not freshen shared index > > '/home/ldiamand/git/dev_full/.git/worktrees/gcc8-take-

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread Rich Felker
On Fri, Feb 08, 2019 at 12:55:11PM +0100, Kevin Daudt wrote: > On Fri, Feb 08, 2019 at 11:45:02AM +, brian m. carlson wrote: > > On Fri, Feb 08, 2019 at 01:04:03AM -0500, Rich Felker wrote: > > [..] > > > In any case, this test seems mainly relevant to Windows users wanting > > > to store sourc

Re: [PATCH v2 18/19] completion: support switch

2019-02-08 Thread SZEDER Gábor
On Fri, Feb 08, 2019 at 04:04:00PM +0700, Nguyễn Thái Ngọc Duy wrote: > Completion support for --guess could be made better. If no --detach is > given, we should only provide a list of refs/heads/* and dwim ones, > not the entire ref space. But I still can't penetrate that > __git_refs() function y

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread brian m. carlson
On Fri, Feb 08, 2019 at 12:55:11PM +0100, Kevin Daudt wrote: > On Fri, Feb 08, 2019 at 11:45:02AM +, brian m. carlson wrote: > > On Fri, Feb 08, 2019 at 01:04:03AM -0500, Rich Felker wrote: > > [..] > > > In any case, this test seems mainly relevant to Windows users wanting > > > to store sourc

Re: t5570-git-daemon fails with SIGPIPE on OSX

2019-02-08 Thread SZEDER Gábor
On Fri, Feb 08, 2019 at 09:32:32AM +0100, Johannes Schindelin wrote: > Team, > > On Mon, 6 Aug 2018, SZEDER Gábor wrote: > > > [Resending with Clemens' last used email address. > > Clemens, please consider sending a patch to update our .mailmap file.] > > > > > > On Mon, Aug 6, 2018 at 5:11 PM

[Hang] t5562 subtest 8 on NonStop

2019-02-08 Thread Randall S. Becker
Hi All, We have suddenly encountered a hung git-http-backend in t5562 in the NonStop port. This is a new problem not seen before on the platform, surprisingly. I am wondering whether this is a result of not actually having an apache2 server on-board. Is that a possibility and can that sub-test be

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread Kevin Daudt
On Fri, Feb 08, 2019 at 11:45:02AM +, brian m. carlson wrote: > On Fri, Feb 08, 2019 at 01:04:03AM -0500, Rich Felker wrote: > [..] > > In any case, this test seems mainly relevant to Windows users wanting > > to store source files in UTF-16LE with BOM. This doesn't really make > > sense to do

[PATCH] test-lib: make '--stress' more bisect-friendly

2019-02-08 Thread SZEDER Gábor
Let's suppose that a test somehow becomes flaky between 'master' and 'pu', and tends to fail within the first 50 repetitions when run with '--stress'. In such a case we could use 'git bisect' to find the culprit: if the test script fails with '--stress', then the commit is definitely bad, but if i

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread brian m. carlson
On Fri, Feb 08, 2019 at 01:04:03AM -0500, Rich Felker wrote: > That information is outdated and someone from our side should update > it; since 1.1.19, musl treats "UTF-16" input as ambiguous endianness > determined by BOM, defaulting to big if there's no BOM. However output > is always big endian,

RE: [Breakage] Git v2.21.0-rc0 - t5403 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 6:10, SZEDER Gábor > On Fri, Feb 08, 2019 at 05:48:27AM -0500, Randall S. Becker wrote: > > We have a few new breakages on the NonStop port in 2.21.0-rc0. The first > is in t5403, as below: > > > > /home/git/git/t/trash > > directory.t5403-post-checkout-hook/clone3/.git/hooks/po

[Fix v1] t5403: correct bash ambiguous redirect error in subtest 8 by quoting $GIT_DIR

2019-02-08 Thread randall . s . becker
From: "Randall S. Becker" The embedded blanks in the full path of the test git repository cased bash to generate an ambugious redirect error. Signed-off-by: Randall S. Becker --- t/t5403-post-checkout-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5403-post-chec

Re: [PATCH v12 18/26] stash: convert push to builtin

2019-02-08 Thread SZEDER Gábor
On Thu, Dec 20, 2018 at 09:44:34PM +0200, Paul-Sebastian Ungureanu wrote: > Add stash push to the helper. > > Signed-off-by: Paul-Sebastian Ungureanu This patch causes rare failures in 't3903-stash.sh', I've seen it break for the first time today in a Travis CI build: +echo bar3 +echo bar4

[PATCH v4 1/3] git-submodule.txt: "--branch " option defaults to 'master'

2019-02-08 Thread Denton Liu
This behavior is mentioned in gitmodules.txt but not in git-submodule.txt so we copy the information over so that it is not missed. Also, add the missed argument to the -b/--branch option. Signed-off-by: Denton Liu --- Documentation/git-submodule.txt | 7 --- 1 file changed, 4 insertions(+)

[PATCH v4 2/3] submodule--helper: teach config subcommand --unset

2019-02-08 Thread Denton Liu
This teaches submodule--helper config the --unset option, which removes the specified configuration key from the .gitmodule file. Signed-off-by: Denton Liu --- builtin/submodule--helper.c | 17 - t/t7411-submodule-config.sh | 9 + 2 files changed, 21 insertions(+), 5 del

[PATCH v4 3/3] submodule: teach set-branch subcommand

2019-02-08 Thread Denton Liu
This teaches git-submodule the set-branch subcommand which allows the branch of a submodule to be set through a porcelain command without having to manually manipulate the .gitmodules file. --- Documentation/git-submodule.txt| 7 ++ contrib/completion/git-completion.bash | 5 +- git-subm

[PATCH v4 0/3] Teach submodule set-branch subcommand

2019-02-08 Thread Denton Liu
Thanks so much for the feedback, Junio. I've updated the patchset based on your comments. Currently, there is no way to set the branch of a submodule without manually manipulating the .gitmodules file. This patchset introduces a porcelain command that enables this. Changes since v1: * Fix

Re: [Breakage] Git v2.21.0-rc0 - t5403 (NonStop)

2019-02-08 Thread SZEDER Gábor
On Fri, Feb 08, 2019 at 05:48:27AM -0500, Randall S. Becker wrote: > We have a few new breakages on the NonStop port in 2.21.0-rc0. The first is > in t5403, as below: > > /home/git/git/t/trash > directory.t5403-post-checkout-hook/clone3/.git/hooks/post-checkout: line 2: > $GIT_DIR/post-checkout

[Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-08 Thread Randall S. Becker
Hi All, t5318 is rather problematic and I have no good way to fix this. There is no /dev/zero on the platform, and the corrupt_graph_and_verify hard-codes if=/dev/zero, which is a linux-specific pseudo device. Please provide a more platform independent way of testing this feature. Pretty much a

RE: [Breakage] Git v2.21.0-rc0 - t5403 (NonStop)

2019-02-08 Thread Randall S. Becker
On February 8, 2019 5:56, Johannes Schindelin wrote: > To: Randall S. Becker > Cc: 'Junio C Hamano' ; git@vger.kernel.org; 'Linux > Kernel' ; git-packag...@googlegroups.com > Subject: Re: [Breakage] Git v2.21.0-rc0 - t5403 (NonStop) > > Hi Randall, > > On Fri, 8 Feb 2019, Randall S. Becker wrote

Re: [PATCH v6 14/16] rebase-interactive: rewrite edit_todo_list() to handle the initial edit

2019-02-08 Thread Phillip Wood
Hi Alban On 06/02/2019 21:11, Alban Gruin wrote: > Hi Phillip, > > I’ve just reread this message and have a couple of additionnal comments. > > Le 01/02/2019 à 12:03, Phillip Wood a écrit : >> Hi Alban >> >> This looks good apart from some missing error handling. >> >> On 29/01/2019 15:01, Alban

Re: [Breakage] Git v2.21.0-rc0 - t5403 (NonStop)

2019-02-08 Thread Johannes Schindelin
Hi Randall, On Fri, 8 Feb 2019, Randall S. Becker wrote: > This looks like it is a "bash thing" and $GIT_DIR might have to be in > quotes, and is not be specific to the platform. If I replace > > echo "$@" >$GIT_DIR/post-checkout.args > > with > > echo "$@" >"$GIT_DIR/post-checkout.args" > >

[Breakage] Git v2.21.0-rc0 - t5403 (NonStop)

2019-02-08 Thread Randall S. Becker
Hi All, We have a few new breakages on the NonStop port in 2.21.0-rc0. The first is in t5403, as below: /home/git/git/t/trash directory.t5403-post-checkout-hook/clone3/.git/hooks/post-checkout: line 2: $GIT_DIR/post-checkout.args: ambiguous redirect not ok 8 - post-checkout hook is triggered b

Re: New command/tool: git filter-repo

2019-02-08 Thread Johannes Schindelin
Hi Elijah, On Thu, 7 Feb 2019, Elijah Newren wrote: > On Thu, Jan 31, 2019 at 12:57 AM Elijah Newren wrote: > > git-filter-repo[1], a filter-branch-like tool for rewriting repository > > history, is ready for more widespread testing and feedback. The rough > > Someone at the Contributor Summit

RE: t0025 flakey?

2019-02-08 Thread Randall S. Becker
On February 7, 2019 18:57, SZEDER Gábor wrote: > On Thu, Feb 07, 2019 at 11:58:08AM -0500, Randall S. Becker wrote: > > > The NonStop port has traditionally had issues with t0025, which we > > > tended to ignore because things did work. We wrote those off as bash > > > issues in > > > t0025 since t

Re: [PATCH 0/1] git-p4: remove ticket expiration test

2019-02-08 Thread Johannes Schindelin
Hi Luke, On Thu, 7 Feb 2019, Luke Diamand wrote: > I've got a mocked-up p4 wrapper which returns whatever expiration time > the test needs. I'll submit it tomorrow. Great! Dscho

Re: [PATCH] ci: clear and mark MAKEFLAGS exported just once

2019-02-08 Thread Johannes Schindelin
Hi, On Fri, 8 Feb 2019, SZEDER Gábor wrote: > On Thu, Feb 07, 2019 at 03:45:46PM -0800, Junio C Hamano wrote: > > Clearing it once upfront, and turning all the assignment into > > appending, would future-proof the code even more, to prevent > > mistakes the previous one fixed from happening again

  1   2   >