Re: [PATCH v2 1/5] core.aheadbehind: add new config setting

2018-04-03 Thread Derrick Stolee
On 4/3/2018 6:18 AM, Ævar Arnfjörð Bjarmason wrote: On Tue, Apr 03 2018, Lars Schneider wrote: What is the state of this series? I can't find it in git/git nor in git-for-windows/git. I think Stolee mentioned the config in his Git Merge talk [1] and I was about to test it/roll it out :-) It's

Re: A potential approach to making tests faster on Windows

2018-04-03 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 03 2018, Johannes Schindelin wrote: > Hi Peff, > > On Fri, 30 Mar 2018, Jeff King wrote: > >> On Fri, Mar 30, 2018 at 08:45:45PM +0200, Ævar Arnfjörð Bjarmason wrote: >> >> > I've wondered for a while whether it wouldn't be a viable approach to >> > make something like an interpreter

Re: [PATCH 1/1] perl: fix installing modules from contrib

2018-04-03 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 03 2018, Christian Hesse wrote: > Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) > removed a target that allowed Makefiles from contrib/ to get the correct > install path. This introduces a new target for main Makefile and fixes > installation for

Re: [PATCH v2 1/5] core.aheadbehind: add new config setting

2018-04-03 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 03 2018, Lars Schneider wrote: >> On 04 Jan 2018, at 20:26, Jeff King wrote: >> >> On Wed, Dec 27, 2017 at 09:41:30AM -0800, Junio C Hamano wrote: >> >>> Jeff King writes: >>> I, too, had a funny feeling about calling this "core". But I didn't

Re: [PATCH v2 1/5] core.aheadbehind: add new config setting

2018-04-03 Thread Lars Schneider
> On 04 Jan 2018, at 20:26, Jeff King wrote: > > On Wed, Dec 27, 2017 at 09:41:30AM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >>> I, too, had a funny feeling about calling this "core". But I didn't have >>> a better name, as I'm not sure what other

Re: A potential approach to making tests faster on Windows

2018-04-03 Thread Johannes Schindelin
Hi Peff, On Fri, 30 Mar 2018, Jeff King wrote: > On Fri, Mar 30, 2018 at 08:45:45PM +0200, Ævar Arnfjörð Bjarmason wrote: > > > I've wondered for a while whether it wouldn't be a viable approach to > > make something like an interpreter for our test suite to get around > > this problem, i.e.

Re: [PATCH 1/9] git_config_set: fix off-by-two

2018-04-03 Thread Johannes Schindelin
Hi Junio, On Fri, 30 Mar 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > What would be a *really* good strategy is: "Oh, there is a problem! Let's > > acknowledge it and try to come up with a solution rather than a > > work-around". > > > >

[PATCH] t2028: tighten grep expression to make "move worktree" test more robust

2018-04-03 Thread Eric Sunshine
Following a rename of worktree "source" to "destination", the "move worktree" test uses grep to verify that the output of "git worktree list --porcelain" does not contain "source" (and does contain "destination"). Unfortunately, the grep expression is too loose and can match unexpectedly. For

[PATCH 1/1] perl: fix installing modules from contrib

2018-04-03 Thread Christian Hesse
Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) removed a target that allowed Makefiles from contrib/ to get the correct install path. This introduces a new target for main Makefile and fixes installation for Mediawiki module. Signed-off-by: Christian Hesse

Re: [PATCH 4/3] Makefile: untangle DEVELOPER and -Werror

2018-04-03 Thread Ævar Arnfjörð Bjarmason
On Sat, Mar 31 2018, Duy Nguyen wrote: > On Sat, Mar 31, 2018 at 6:40 PM, Ævar Arnfjörð Bjarmason > wrote: >> Change the DEVELOPER flag, and the newly added EAGER_DEVELOPER flag >> which (approximately) enables -Wextra so that any combination of them >> and -Werror can be set.

Re: Test t2028 failes

2018-04-03 Thread Jens Krüger
Am 03.04.2018 um 10:47 schrieb Eric Sunshine: On Tue, Apr 3, 2018 at 4:42 AM, Jens Krüger wrote: Maybe, the attached patch may help. On my machine(s) it helped. git worktree list --porcelain >out && grep "^worktree.*/destination" out && - ! grep

Re: Test t2028 failes

2018-04-03 Thread Eric Sunshine
On Tue, Apr 3, 2018 at 4:42 AM, Jens Krüger wrote: > Maybe, the attached patch may help. On my machine(s) it helped. > git worktree list --porcelain >out && > grep "^worktree.*/destination" out && > - ! grep "^worktree.*/source" out && > + ! grep

Re: Test t2028 failes

2018-04-03 Thread Eric Sunshine
On Tue, Apr 3, 2018 at 4:38 AM, Jens Krüger wrote: > Am 03.04.2018 um 10:16 schrieb Eric Sunshine: >> Using the "out" file you attached, can you show the output of these >> commands? >> grep "^worktree.*/destination" out >> echo $? >> grep

Re: Test t2028 failes

2018-04-03 Thread Jens Krüger
Am 03.04.2018 um 10:16 schrieb Eric Sunshine: On Tue, Apr 3, 2018 at 4:01 AM, Jens Krüger wrote: The actual2 file does not exists, if I call the ./t2028-worktree-move.sh with the '-v -i' options, only without any option or with '-v' option. The content of the

Re: Test t2028 failes

2018-04-03 Thread Jens Krüger
Am 03.04.2018 um 10:16 schrieb Eric Sunshine: On Tue, Apr 3, 2018 at 4:01 AM, Jens Krüger wrote: The actual2 file does not exists, if I call the ./t2028-worktree-move.sh with the '-v -i' options, only without any option or with '-v' option. The content of the

Re: [PATCH v12 00/10] convert: add support for different encodings

2018-04-03 Thread Lars Schneider
> On 02 Apr 2018, at 20:31, Lars Schneider wrote: > > >> On 29 Mar 2018, at 20:37, Junio C Hamano wrote: >> >> lars.schnei...@autodesk.com writes: >> >>> From: Lars Schneider >>> >>> Patches 1-6,9 are preparation and

Re: Test t2028 failes

2018-04-03 Thread Eric Sunshine
On Tue, Apr 3, 2018 at 4:01 AM, Jens Krüger wrote: > The actual2 file does not exists, if I call the ./t2028-worktree-move.sh > with the '-v -i' options, only without any option or with '-v' option. The content of the various files looks correct, and absence of

Re: Test t2028 failes

2018-04-03 Thread Jens Krüger
The actual2 file does not exists, if I call the ./t2028-worktree-move.sh with the '-v -i' options, only without any option or with '-v' option. Am 03.04.2018 um 08:58 schrieb Eric Sunshine: On Tue, Apr 3, 2018 at 2:33 AM, Jens Krüger wrote: *** t2028-worktree-move.sh

Re: [PATCH v2 2/2] t3200: verify "branch --list" sanity when rebasing from detached HEAD

2018-04-03 Thread Eric Sunshine
On Tue, Apr 3, 2018 at 12:31 AM, Kaartic Sivaraam wrote: > From: Eric Sunshine > > "git branch --list" shows an in-progress rebase as: > > * (no branch, rebasing ) > master > ... > > However, if the rebase is started from a detached

Re: Test t2028 failes

2018-04-03 Thread Eric Sunshine
On Tue, Apr 3, 2018 at 2:33 AM, Jens Krüger wrote: > *** t2028-worktree-move.sh *** > not ok 12 - move worktree > # > # toplevel="$(pwd)" && > # git worktree move source destination && > # test_path_is_missing source && > #

Test t2028 failes

2018-04-03 Thread Jens Krüger
Test 2028 failes: Git version: 2.17.0 (checked out from github repository) OS: Debian9(9.4), Debian 8 (8.10) and xubuntu 14.04(14.04.5 LTS) gcc: gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 gcc (Debian 4.9.2-10+deb8u1) 4.9.2 gcc (Ubuntu 4.8.4-2ubuntu1~14.04.4) 4.8.4 configure

<    1   2