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

2019-02-08 Thread Johannes Schindelin
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 SZEDER Gábor wrote: > > > > Travis CI changed its default OSX image to use XCode 9.4 o

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

2019-02-08 Thread Henning Schild
Hi, 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. Henning Am Thu, 7 Feb 2019 22:17:4

Re: [PATCH 08/19] checkout: split part of it to new command switch

2019-02-08 Thread Duy Nguyen
On Thu, Jan 31, 2019 at 8:09 PM SZEDER Gábor wrote: > > On Wed, Jan 30, 2019 at 04:48:20PM +0700, Nguyễn Thái Ngọc Duy wrote: > > diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt > > new file mode 100644 > > index 00..953c9747b2 > > > +--orphan :: > > + Create a

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

2019-02-08 Thread Johannes Schindelin
Hi Peff, 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 responded). Admittedly, I do not really understand all aspects of it, but it applies, still, and I kicked off a stress test here: https

[PATCH v2 05/19] checkout: make "opts" in cmd_checkout() a pointer

2019-02-08 Thread Nguyễn Thái Ngọc Duy
"opts" will soon be moved out of cmd_checkout(). To keep changes in that patch smaller, convert "opts" to a pointer and keep the real thing behind "real_opts". Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 115 +++-- 1 file changed, 58 inser

[PATCH v2 03/19] t: rename t2014-switch.sh to t2014-checkout-switch.sh

2019-02-08 Thread Nguyễn Thái Ngọc Duy
The old name does not really say that this is about 'checkout -b'. See 49d833dc07 (Revert "checkout branch: prime cache-tree fully" - 2009-05-12) for more information Signed-off-by: Nguyễn Thái Ngọc Duy --- t/{t2014-switch.sh => t2014-checkout-switch.sh} | 0 1 file changed, 0 insertions(+), 0 d

[PATCH v2 00/19] Add new command "switch"

2019-02-08 Thread Nguyễn Thái Ngọc Duy
This series adds a new command "switch" for switching branches, an alternative for "git checkout". v2 fixes the comments I got from v1. I think the range-diff below summarizes it better than I do. No major changes though. Range-diff dựa trên v1: 1: 6d550b443c ! 1: 2283204090 checkout: split p

[PATCH v2 02/19] doc: document --overwrite-ignore

2019-02-08 Thread Nguyễn Thái Ngọc Duy
I added this option in git-checkout and git-merge in c1d7036b6b (checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore - 2011-11-27) but did not remember to update documentation. This completes that commit. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkou

[PATCH v2 04/19] checkout: factor out some code in parse_branchname_arg()

2019-02-08 Thread Nguyễn Thái Ngọc Duy
This is in preparation for the new command restore, which also needs to parse opts->source_tree but does not need all the disambiguation logic. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 51 -- 1 file changed, 31 insertions(+), 20 del

[PATCH v2 06/19] checkout: move 'confict_style' and 'dwim_..' to checkout_opts

2019-02-08 Thread Nguyễn Thái Ngọc Duy
These local variables are referenced by struct option[]. This struct will soon be broken down, moved away and we can't rely on local variables anymore. Move these two to struct checkout_opts in preparation for that. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 17 ++--

[PATCH v2 01/19] git-checkout.txt: fix one syntax line

2019-02-08 Thread Nguyễn Thái Ngọc Duy
can be omitted in this syntax, and it's actually documented a few paragraphs down: You could omit , in which case the command degenerates to "check out the current branch", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for

[PATCH v2 07/19] checkout: split options[] array in three pieces

2019-02-08 Thread Nguyễn Thái Ngọc Duy
This is a preparation step for introducing new commands that do parts of what checkout does. There will be two new commands, one is about switching branches, detaching HEAD... one about checking out paths. These share the a subset of command line options. The rest of command line options are separa

[PATCH v2 08/19] checkout: split part of it to new command switch

2019-02-08 Thread Nguyễn Thái Ngọc Duy
"git checkout" doing too many things is a source of confusion for many users (and it even bites old timers sometimes). To remedy that, the command will be split into two new ones: switch and something-to-checkout-paths. The good old "git checkout" command is still here and will be until all (or mos

[PATCH v2 10/19] switch: remove -l

2019-02-08 Thread Nguyễn Thái Ngọc Duy
This option is ancient. Nowadays reflog is enabled by default and automatically created for new branches. Keep it in git-checkout only. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/checkout.c b/builtin/chec

[PATCH v2 11/19] switch: stop accepting pathspec

2019-02-08 Thread Nguyễn Thái Ngọc Duy
This command is about switching branch (or creating a new one) and should not accept pathspec. This helps simplify ambiguation handling. The other two ("git checkout" and "git restore") of course do accept pathspec as before. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 20 ++

[PATCH v2 09/19] switch: better names for -b and -B

2019-02-08 Thread Nguyễn Thái Ngọc Duy
The shortcut of these options do not make much sense when used with switch. And their descriptions are also tied to checkout out. Move -b/-B to cmd_checkout() and new -c/-C with the same functionality in cmd_switch_branch() Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 32

[PATCH v2 12/19] switch: reject "do nothing" case

2019-02-08 Thread Nguyễn Thái Ngọc Duy
"git checkout" can be executed without any arguments. What it does is not exactly great: it switches from HEAD to HEAD and shows worktree modification as a side effect. Make switch reject this case. Just use "git status" if you want that side effect. For switch, you have to either - really switch

[PATCH v2 13/19] switch: only allow explicit detached HEAD

2019-02-08 Thread Nguyễn Thái Ngọc Duy
"git checkout " will checkout the commit in question and detach HEAD from the current branch. It is naturally a right thing to do once you get git references. But detached HEAD is a scary concept to new users because we show a lot of warnings and stuff, and it could be hard to get out of (until you

[PATCH v2 15/19] switch: no implicit dwim, use --guess to dwim

2019-02-08 Thread Nguyễn Thái Ngọc Duy
Similar to automatic detach, this behavior could be confusing because it can sometimes create a new branch without a user asking it to, especially when the user is still not aware about this feature. In the future, perhaps we could have a config key to disable these safety nets and let 'switch' do

[PATCH v2 14/19] switch: add short option for --detach

2019-02-08 Thread Nguyễn Thái Ngọc Duy
"git checkout" automatically detaches branches and --detach is not that useful (--no-detach is more likely). But for "switch", you may want to use it more often once you're used to detached HEAD. This of course adds -d to git-checkout but it does not harm (yet?) to do it. Signed-off-by: Nguyễn Thá

[PATCH v2 16/19] switch: no worktree status unless real branch switch happens

2019-02-08 Thread Nguyễn Thái Ngọc Duy
When we switch from one branch to another, it makes sense to show a summary of local changes since there could be conflicts, or some files left modified When switch is used solely for creating a new branch (and "switch" to the same commit) or detaching, we don't really need to show anything. "

[PATCH v2 19/19] doc: promote "git switch"

2019-02-08 Thread Nguyễn Thái Ngọc Duy
The new command "git switch" is added to avoid the confusion of one-command-do-all "git checkout" for new users. They are also helpful to avoid ambiguation context. For these reasons, promote it everywhere possible. This includes documentation, suggestions/advice from other commands... Signed-off

[PATCH v2 18/19] completion: support switch

2019-02-08 Thread Nguyễn Thái Ngọc Duy
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 yet. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completi

Re: [PATCH 1/1] git-p4: recover from inconsistent perforce history

2019-02-08 Thread Andrew Oakley
On Thu, 7 Feb 2019 08:04:20 + Luke Diamand wrote: > On Wed, 6 Feb 2019 19:42:19 + > and...@adoakley.name wrote: > > > From: Andrew Oakley > > > > Perforce allows you commit files and directories with the same > > name, so you could have files //depot/foo and //depot/foo/bar both > > c

[PATCH v2 17/19] t: add tests for switch

2019-02-08 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t2060-switch.sh | 87 +++ 1 file changed, 87 insertions(+) create mode 100755 t/t2060-switch.sh diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh new file mode 100755 index 00..1e1e834c1b --- /dev/nul

[PATCH v2] git-p4: recover from inconsistent perforce history

2019-02-08 Thread andrew
From: Andrew Oakley Perforce allows you commit files and directories with the same name, so you could have files //depot/foo and //depot/foo/bar both checked in. A p4 sync of a repository in this state fails. Deleting one of the files recovers the repository. When this happens we want git-p4 t

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

2019-02-08 Thread Johannes Schindelin
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 > responded). > > Admittedly, I do not really understand all aspects of it, but it applies,

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

2019-02-08 Thread Johannes Schindelin via GitGitGadget
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 --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --

[PATCH 0/1] Add .mailmap entries for Clemens "drizzd" Buchacher

2019-02-08 Thread Johannes Schindelin via GitGitGadget
Gábor pointed out [https://public-inbox.org/git/cam0vkjkm-thzaly20vrz-jsmyzjuxuqp1caocprezxrsbfr...@mail.gmail.com/] that some of Clemens' email addresses bounce, and that the .mailmap file should be updated accordingly. This makes it so. Johannes Schindelin (1): .mailmap: map Clemens Buchache

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

2019-02-08 Thread Duy Nguyen
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.' Th

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

2019-02-08 Thread Johannes Schindelin
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= > >> + > >> # Set 'exit on error' for all CI scripts to let the caller know that > >> # something went wrong. > >>

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

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: 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: 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

[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: [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" > >

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 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

[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 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

[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

[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 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(+)

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

[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: [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

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,

[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 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

[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: 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

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: [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 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: 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: [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: [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: [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: 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: [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: 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: 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: [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: [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 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 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: 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] 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: [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

[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: [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

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: [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: 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

[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: [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

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: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: [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: [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,

[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 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

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 > >

[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

[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 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

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

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: [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: [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: 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: [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: 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: [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: [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: [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: [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

  1   2   >