Re: [PATCH] t5510: run auto-gc in the foreground

2016-05-03 Thread Johannes Schindelin
Hi Gábor, On Tue, 3 May 2016, SZEDER Gábor wrote: > Quoting SZEDER Gábor : > > >Quoting Johannes Schindelin : > > > > >Hi Gábor, > > > > > >On Sun, 1 May 2016, SZEDER Gábor wrote: > > > > > > >diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh > > >

Re: [PATCH 1/2] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-03 Thread Pranit Bauva
On Wed, May 4, 2016 at 10:37 AM, Pranit Bauva wrote: > `--next-all` is meant to be used as a sub command to support multiple > "operation mode" though the current implementation does not contain any > other sub command along side with `--next-all` but further commits will

Re: [PATCH 0/2] bisect--helper: rewrite of check_term_format()

2016-05-03 Thread Pranit Bauva
On Wed, May 4, 2016 at 10:52 AM, Christian Couder wrote: > Pranit, > > My gmail address is "christian.cou...@gmail.com", not > "christain.cou...@gmail.com". ('i' and 'a' are in the wrong oder in my > first name). > > Thanks, > Christian. Sorry. It was a typo. -- To

Re: [PATCH 0/2] bisect--helper: rewrite of check_term_format()

2016-05-03 Thread Christian Couder
Pranit, My gmail address is "christian.cou...@gmail.com", not "christain.cou...@gmail.com". ('i' and 'a' are in the wrong oder in my first name). Thanks, Christian. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More

[PATCH 1/2] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-03 Thread Pranit Bauva
`--next-all` is meant to be used as a sub command to support multiple "operation mode" though the current implementation does not contain any other sub command along side with `--next-all` but further commits will include some more subcommands. Mentored-by: Lars Schneider

[PATCH 2/2] bisect: rewrite `check_term_format` shell function in C

2016-05-03 Thread Pranit Bauva
This reimplements the `check_term_format` shell function in C and adds a `--check-term-format` subcommand to `git bisect--helper` to call it from git-bisect.sh Helped-by: Johannes Schindelein Mentored-by: Lars Schneider Mentored-by:

[PATCH 0/2] bisect--helper: rewrite of check_term_format()

2016-05-03 Thread Pranit Bauva
Important Changes: * The previous patch is split into two patches for a better and logical commit history. * As previously absent, strbuf is used for string manipulation. * This passes the complete test suite unlike the previous patches. * Proper use of error handling (die() and error()

Re: [PATCH v8 10/10] ce_compare_data() did not respect conversion

2016-05-03 Thread Torsten Bögershausen
On 05/03/2016 08:31 PM, Junio C Hamano wrote: Torsten Bögershausen writes: This will probably take some time, so that's why I asked if 1/10..4/10 could proceed as is ? Sure, I wasn't saying 1-4 looked wrong at all. I was wondering why the ones in the middle, especially 7,

[PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-03 Thread Stefan Beller
The discussion in [1] realized that '.' is a faulty suggestion as there is a corner case where it fails: > "submodule deinit ." may have "worked" in the sense that you would > have at least one path in your tree and avoided this "nothing > matches" most of the time. It would have still failed

Re: [RFD/PATCH] submodule doc: describe where we can configure them

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 4:56 PM, Jonathan Nieder wrote: > Stefan Beller wrote: > >> This is similar to the gitignore document, but doesn't mirror >> the current situation. It is rather meant to start a discussion for >> the right approach for mirroring repositories with

Re: [PATCHv2] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-03 Thread Jonathan Nieder
Stefan Beller wrote: [...] >>$ rungit v2.6.6 submodule deinit . >>error: pathspec '.' did not match any file(s) known to git. >>Did you forget to 'git add'? >>$ >file && git add file >>$ rungit v2.6.6 submodule deinit . >>$ echo $? >>0 > >

[PATCHv2] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-03 Thread Stefan Beller
The discussion in [1] realized that '.' is a faulty suggestion as there is a corner case where it fails: > "submodule deinit ." may have "worked" in the sense that you would > have at least one path in your tree and avoided this "nothing > matches" most of the time. It would have still failed

Re: [RFD/PATCH] submodule doc: describe where we can configure them

2016-05-03 Thread Jonathan Nieder
Stefan Beller wrote: > This is similar to the gitignore document, but doesn't mirror > the current situation. It is rather meant to start a discussion for > the right approach for mirroring repositories with submodules. Ooh. [...] > --- a/Documentation/git-submodule.txt > +++

Re: remotes

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 4:36 PM, Kovacs Levente wrote: > On Tue, 03 May 2016 13:38:22 -0700 > Junio C Hamano wrote: > >> Lev writes: >> >> > I accidentally added a remote of another repository to my config >> > file. And so I

Re: remotes

2016-05-03 Thread Kovacs Levente
On Tue, 03 May 2016 13:38:22 -0700 Junio C Hamano wrote: > Lev writes: > > > I accidentally added a remote of another repository to my config > > file. And so I merged two different repositories together. Is there > > any real user case for this? >

[RFD/PATCH] submodule doc: describe where we can configure them

2016-05-03 Thread Stefan Beller
This is similar to the gitignore document, but doesn't mirror the current situation. It is rather meant to start a discussion for the right approach for mirroring repositories with submodules. Signed-off-by: Stefan Beller --- Jonathan, is this something you had in mind?

Re: [PATCH] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 3:52 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> So eventually (i.e. after the submodule groups lands) >> "submodule deinit ." will start acting weird again? > > It would be nice if it never acts in a weird way, but that is

Re: [PATCH v4 09/11] connect: use "-l user" instead of "user@" on ssh command line

2016-05-03 Thread Mike Hommey
On Tue, May 03, 2016 at 01:33:24PM -0400, Eric Sunshine wrote: > On Tue, May 3, 2016 at 4:50 AM, Mike Hommey wrote: > > While it is not strictly necessary, it makes the connect code simpler > > when there is user. > > > > Signed-off-by: Mike Hommey > > --- >

Re: [PATCH] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-03 Thread Junio C Hamano
Stefan Beller writes: > So eventually (i.e. after the submodule groups lands) > "submodule deinit ." will start acting weird again? It would be nice if it never acts in a weird way, but that is all future development, not related to this fix, no? -- To unsubscribe from this

Re: [PATCH v4 08/11] connect: change the --diag-url output to separate user and host

2016-05-03 Thread Mike Hommey
On Tue, May 03, 2016 at 01:23:37PM -0400, Eric Sunshine wrote: > On Tue, May 3, 2016 at 12:20 PM, Torsten Bögershausen wrote: > > On 2016-05-03 10.50, Mike Hommey wrote: > >> - git fetch-pack --diag-url "$1" | grep -v host= | grep -v port= > >> >actual && > >> + git

What's cooking in git.git (May 2016, #01; Tue, 3)

2016-05-03 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The 'master' branch now has the

Re: [PATCH v4 01/11] add fetch-pack --diag-url tests for some corner cases

2016-05-03 Thread Mike Hommey
On Tue, May 03, 2016 at 09:07:41AM -0700, Junio C Hamano wrote: > Mike Hommey writes: > > > t5603-clone-dirname uses url patterns that are not tested with > > fetch-pack --diag-url, and it would be useful if they were. > > > > Interestingly, some of those tests, involving both

Re: [PATCH] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 3:28 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> I developed it on top of >> "submodule deinit test: fix broken && chain in subshell" >> on top of 2a4c8c36a7f6, 2016-03-24, Merge branch >>

Re: avoid duplicate patches from git log ?

2016-05-03 Thread Philip Oakley
From: "Junio C Hamano" Jeff King writes: On Tue, May 03, 2016 at 09:11:55PM +0100, Philip Oakley wrote: However, as the G4W project (https://github.com/git-for-windows/git/) follows the main git repo and its releases, it needs to rebase it's fixup

Re: [PATCH] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-03 Thread Junio C Hamano
Stefan Beller writes: > I developed it on top of > "submodule deinit test: fix broken && chain in subshell" > on top of 2a4c8c36a7f6, 2016-03-24, Merge branch > 'sb/submodule-module-list-pathspec-fix' > but I think this would rather go in as a new feature, not on

Re: avoid duplicate patches from git log ?

2016-05-03 Thread Junio C Hamano
Jeff King writes: > On Tue, May 03, 2016 at 09:11:55PM +0100, Philip Oakley wrote: > >> However, as the G4W project (https://github.com/git-for-windows/git/) >> follows the main git repo and its releases, it needs to rebase it's fixup >> patches, while retaining their original

[PATCH] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-03 Thread Stefan Beller
The discussion in [1] realized that '.' is a faulty suggestion as there is a corner case where it fails: > "submodule deinit ." may have "worked" in the sense that you would > have at least one path in your tree and avoided this "nothing > matches" most of the time. It would have still failed

Re: avoid duplicate patches from git log ?

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 09:11:55PM +0100, Philip Oakley wrote: > However, as the G4W project (https://github.com/git-for-windows/git/) > follows the main git repo and its releases, it needs to rebase it's fixup > patches, while retaining their original series, so has repeated copies of > those

Re: [PATCH 0/3] preparatory patches for the submodule groups

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 2:32 PM, Junio C Hamano wrote: > Stefan Beller writes: > * I think we want to head for consistency, eventually. e.g. commands with no arguments such as tag, branch give a list of their respective domain. >>> >>>

Re: [PATCH] t7300: mark test with SANITY

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 02:19:24PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Maybe. I admit to not really using the Travis tests myself, as they are > > way too slow and cumbersome to debug compared to just running "make > > test". The primary value to me of

t7900-*.sh tesr #5 failure

2016-05-03 Thread Ramsay Jones
Hi David, Test t7900.5 fails for me, thus: $ ./t7900-index-helper.sh -i -v -x -d ... + test -S .git/index-helper.sock + git status On branch master Untracked files: (use "git add ..." to include in what will be committed) err nothing added to commit but

Re: [PATCH 0/3] preparatory patches for the submodule groups

2016-05-03 Thread Junio C Hamano
Stefan Beller writes: >>> * I think we want to head for consistency, eventually. >>>e.g. commands with no arguments such as tag, branch >>>give a list of their respective domain. >> >> Isn't that a historical mistake we are regretting, though? Only >> after many

Re: Git 2.8.1 fails test 32 of t7300-clean.sh, breaks profile build

2016-05-03 Thread erik elfström
Thanks for fixing the missing SANITY prerequisite Stefan. As for the error handling logic in setup.c: is_nonbare_repository_dir (was clean.c: is_git_repository) my reasoning is as follows: READ_GITFILE_ERR_STAT_FAILED READ_GITFILE_ERR_NOT_A_FILE: When checking random paths for .git files these

Re: [PATCH 06/14] remote.h: add get_remote_capabilities, request_capabilities

2016-05-03 Thread David Turner
On Tue, 2016-05-03 at 01:33 -0400, Jeff King wrote: > On Mon, May 02, 2016 at 02:57:43PM -0400, David Turner wrote: > > > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > > > > > +const char *known_capabilities[] = { > > > + "multi_ack", > > > + "thin-pack", > > > + "side-band", > > >

Re: [PATCH] t7300: mark test with SANITY

2016-05-03 Thread Junio C Hamano
Jeff King writes: > Maybe. I admit to not really using the Travis tests myself, as they are > way too slow and cumbersome to debug compared to just running "make > test". The primary value to me of centralized CI is: > > 1. _If_ people are looking at PRs on GitHub, the test

Re: [PATCH] t7300: mark test with SANITY

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 12:28:12PM -0700, Junio C Hamano wrote: > By the way, it is easy to make a mistake like this, not to notice it > during a review, and to leave it unnoticed for a long time, > especially because I do not think anybody active in the development > community runs tests as

Re: [PATCH 0/3] preparatory patches for the submodule groups

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 2:01 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> I have your patch here and have a "-a and pathspec are incompatible" fix >> build on top. >> * I do wonder if we want to have the shortform '-a' though. > > I do not

Re: [PATCH 0/3] preparatory patches for the submodule groups

2016-05-03 Thread Junio C Hamano
Stefan Beller writes: > I have your patch here and have a "-a and pathspec are incompatible" fix > build on top. > * I do wonder if we want to have the shortform '-a' though. I do not particularly care. I was merely matching the other two options there. > * I think we want

Re: [PATCH 0/3] preparatory patches for the submodule groups

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 1:27 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Stefan Beller (3): >> submodule deinit test: fix broken && chain in subshell >> submodule deinit: lose requirement for giving '.' >> submodule init: redirect stdout to

Re: remotes

2016-05-03 Thread Junio C Hamano
Lev writes: > I accidentally added a remote of another repository to my config file. And so > I > merged two different repositories together. Is there any real user case for > this? Using multiple remotes is a perfectly normal way in which you are expected to interact

Re: [PATCH 0/3] preparatory patches for the submodule groups

2016-05-03 Thread Junio C Hamano
Stefan Beller writes: > Stefan Beller (3): > submodule deinit test: fix broken && chain in subshell > submodule deinit: lose requirement for giving '.' > submodule init: redirect stdout to stderr So... * I'll take "&&-chain" patch on a separate topic on 84ba959, to

avoid duplicate patches from git log ?

2016-05-03 Thread Philip Oakley
I was trying to search the Git for Windows (G4W) history for commits that touched MSVC. I've used 'git log -SMSVC --pretty='tformat:%h (%s, %ad)' --date=short --reverse' to get a nice list of those commits. However, as the G4W project (https://github.com/git-for-windows/git/) follows the

Re: [PATCH v2 00/41] Add and use error_errno() and warning_errno()

2016-05-03 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Changes are in > > [01/41] usage.c: move format processing out of die_errno() > [02/41] usage.c: add warning_errno() and error_errno() > [12/41] builtin/update-index.c: prefer "err" to "errno" in > process_lstat_error > [17/41]

Re: [PATCH v2 14/41] builtin/worktree.c: use error_errno()

2016-05-03 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > builtin/worktree.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/worktree.c b/builtin/worktree.c > index d8e3795..331ecf6 100644 > ---

Re: [PATCH v2 11/41] builtin/rm.c: use warning_errno()

2016-05-03 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > builtin/rm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/rm.c b/builtin/rm.c > index 8829b09..13b9639 100644 > --- a/builtin/rm.c > +++

Re: [PATCH v2 10/41] builtin/pack-objects.c: use die_errno() and warning_errno()

2016-05-03 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > @@ -2020,7 +2018,7 @@ static void ll_find_deltas(struct object_entry **list, > unsigned list_size, > ret = pthread_create([i].thread, NULL, >

Re: [PATCH v2 08/41] builtin/mailsplit.c: use error_errno()

2016-05-03 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c > - error("cannot opendir %s (%s)", name, strerror(errno)); > + error_errno("cannot opendir %s", name); > - error("cannot open

Re: [PATCH 1/3] submodule deinit test: fix broken && chain in subshell

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 9:19 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- >> t/t7400-submodule-basic.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git

Re: [PATCH] t7300: mark test with SANITY

2016-05-03 Thread Junio C Hamano
Jeff King writes: > On Tue, May 03, 2016 at 11:54:32AM -0700, Stefan Beller wrote: > >> As the test runs `chmod 0` on a file, we don't want to run that test >> as root. > > This somehow misses the root (no pun intended) of the issue, to me. > Perhaps: > > We `chmod 0` a file and

Re: [PATCH 2/3] submodule deinit: lose requirement for giving '.'

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 12:08 PM, Junio C Hamano wrote: > On Tue, May 3, 2016 at 11:07 AM, Stefan Beller wrote: >> >> So maybe we want to add a check that no pathspec arguments are >> given when >> --all is given? > > Yeah, I overlooked that case. Just like

Re: [PATCH v2 06/41] builtin/fetch.c: use error_errno()

2016-05-03 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > diff --git a/builtin/fetch.c b/builtin/fetch.c > index f8455bd..1582ca7 100644 > --- a/builtin/fetch.c > +++ b/builtin/fetch.c > @@ -607,7 +607,7 @@ static int store_updated_refs(const char *raw_url, const > char *remote_name, > > fp =

Re: [PATCH] t7300: mark test with SANITY

2016-05-03 Thread Junio C Hamano
Jeff King writes: > On Tue, May 03, 2016 at 11:54:32AM -0700, Stefan Beller wrote: > >> As the test runs `chmod 0` on a file, we don't want to run that test >> as root. > > This somehow misses the root (no pun intended) of the issue, to me. > Perhaps: > > We `chmod 0` a file and

Re: [PATCH 2/3] submodule deinit: lose requirement for giving '.'

2016-05-03 Thread Junio C Hamano
On Tue, May 3, 2016 at 11:07 AM, Stefan Beller wrote: > > So maybe we want to add a check that no pathspec arguments are > given when > --all is given? Yeah, I overlooked that case. Just like "commit -a path" errors out, we should. -- To unsubscribe from this list: send the

Re: [PATCH] t7300: mark test with SANITY

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 11:54:32AM -0700, Stefan Beller wrote: > As the test runs `chmod 0` on a file, we don't want to run that test > as root. This somehow misses the root (no pun intended) of the issue, to me. Perhaps: We `chmod 0` a file and test a case where git is unable to read it.

Re: Git 2.8.1 fails test 32 of t7300-clean.sh, breaks profile build

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 11:53:36AM -0700, Stefan Beller wrote: > > is related or worth doing on top. But I don't think so. That code is > > just trying to convert some error-cases into "let's err on the side of > > assuming it is a repo". Doing that for all values of gitfile_error is > >

Re: Re* [PATCH] commit-tree: do not pay attention to commit.gpgsign

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 11:01:11AM -0700, Junio C Hamano wrote: > Ignoring commit.gpgsign option _obviously_ breaks the backward > compatibility, but it is easy to follow the standard pattern in > scripts to honor whatever configuration variable they choose to > follow. E.g. > > case

[PATCH] t7300: mark test with SANITY

2016-05-03 Thread Stefan Beller
As the test runs `chmod 0` on a file, we don't want to run that test as root. Reported-by: Jan Keromnes Fix-proposed-by: Junio C Hamano Signed-off-by: Stefan Beller --- t/t7300-clean.sh | 2 +- 1 file changed, 1 insertion(+), 1

Re: Git 2.8.1 fails test 32 of t7300-clean.sh, breaks profile build

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 11:48 AM, Jeff King wrote: > On Tue, May 03, 2016 at 11:05:09AM -0700, Junio C Hamano wrote: > >> On Tue, May 3, 2016 at 11:02 AM, Stefan Beller wrote: >> > >> > So I wonder if is_nonbare_repository_dir() is the culprit here. >> > (We do

Re: Git 2.8.1 fails test 32 of t7300-clean.sh, breaks profile build

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 11:05:09AM -0700, Junio C Hamano wrote: > On Tue, May 3, 2016 at 11:02 AM, Stefan Beller wrote: > > > > So I wonder if is_nonbare_repository_dir() is the culprit here. > > (We do a chmod 0 on the .git before the `git clean` in the test to confuse > >

Re: [PATCH v2] gitweb: apply fallback encoding before highlight

2016-05-03 Thread Junio C Hamano
Shin Kojima writes: > Some multi-byte character encodings (such as Shift_JIS and GBK) have > characters whose final bytes is an ASCII '\' (0x5c), and they > will be displayed as funny-characters even if $fallback_encoding is > correct. Just out of curiosity, do people still use

Re: [PATCH v8 10/10] ce_compare_data() did not respect conversion

2016-05-03 Thread Junio C Hamano
Torsten Bögershausen writes: > This will probably take some time, so that's why I asked if 1/10..4/10 could > proceed as is ? Sure, I wasn't saying 1-4 looked wrong at all. I was wondering why the ones in the middle, especially 7, shouldn't be moved forward together with them.

[ANNOUNCE] Git for Windows 2.8.2

2016-05-03 Thread Johannes Schindelin
Dear Git users, It is my pleasure to announce that Git for Windows 2.8.2 is available from: https://git-for-windows.github.io/ Changes since Git for Windows v2.8.1 (April 4th 2016) New Features ??? Comes with Git v2.8.2. ??? Starting with version 2.8.2, Git for Windows is also

Re: [PATCH 2/3] submodule deinit: lose requirement for giving '.'

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 10:21 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> The discussion in [1] realized that '.' is a faulty suggestion as >> there is a corner case where it fails: >> >>> "submodule deinit ." may have "worked" in the sense that

Re: Git 2.8.1 fails test 32 of t7300-clean.sh, breaks profile build

2016-05-03 Thread Junio C Hamano
On Tue, May 3, 2016 at 11:02 AM, Stefan Beller wrote: > > So I wonder if is_nonbare_repository_dir() is the culprit here. > (We do a chmod 0 on the .git before the `git clean` in the test to confuse > Git) Ask if the test is run as root; if so, then mark the test to require

Re: Git 2.8.1 fails test 32 of t7300-clean.sh, breaks profile build

2016-05-03 Thread Stefan Beller
On Tue, May 3, 2016 at 2:19 AM, Jan Keromnes wrote: > Thanks for your replies! I was able to reproduce to failure on Git 2.8.2. > > Steps: > > # Build Git 2.8.2 and run t/t7300-clean.sh in a Dockerfile based on > ubuntu:14.04. > RUN mkdir /tmp/git \ > && cd /tmp/git \ > && curl

Re* [PATCH] commit-tree: do not pay attention to commit.gpgsign

2016-05-03 Thread Junio C Hamano
Jeff King writes: > So I think the motivation and premise are good, but... > >> -static int commit_tree_config(const char *var, const char *value, void *cb) >> -{ >> -int status = git_gpg_config(var, value, NULL); >> -if (status) >> -return status; >> -if

Re: [PATCH v3 1/2] Documentation: fix linkgit references

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 08:41:37AM -0700, Junio C Hamano wrote: > Even though you obviously were fooled by AsciiDoctor regarding > literal double dash {litdd}, other parts of the changes did look > good typofixes. Thanks for starting this. Yeah, I stopped reading after seeing the first hunk,

Re: [PATCH v3 1/2] Documentation: fix linkgit references

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 10:30:09AM +0200, Lars Schneider wrote: > > So I think that's a step backwards. I did check the asciidoctor > > rendering on git-scm.com, though, and it gets the {litdd} case wrong. So > > I think it does need fixing, but we need a solution that looks correct > > in both

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

2016-05-03 Thread Jacob Keller
On Mon, May 2, 2016 at 11:02 AM, Jeff King wrote: > On Mon, May 02, 2016 at 10:40:28AM -0700, Junio C Hamano wrote: > >> "Keller, Jacob E" writes: >> >> > True. I think the chances that it needs such a thing are quite minor, >> > and if an undocumented

Re: [PATCH v4 09/11] connect: use "-l user" instead of "user@" on ssh command line

2016-05-03 Thread Junio C Hamano
Torsten Bögershausen writes: > On 2016-05-03 10.50, Mike Hommey wrote: >> While it is not strictly necessary, it makes the connect code simpler >> when there is user. >> > > That commit message does't tell too much, I think. "Doesn't tell too much" is not necessarily bad, but

Re: [PATCH v4 09/11] connect: use "-l user" instead of "user@" on ssh command line

2016-05-03 Thread Eric Sunshine
On Tue, May 3, 2016 at 4:50 AM, Mike Hommey wrote: > While it is not strictly necessary, it makes the connect code simpler > when there is user. > > Signed-off-by: Mike Hommey > --- > diff --git a/connect.c b/connect.c > @@ -812,14 +812,10 @@ struct

Re: [PATCH v4 08/11] connect: change the --diag-url output to separate user and host

2016-05-03 Thread Eric Sunshine
On Tue, May 3, 2016 at 12:20 PM, Torsten Bögershausen wrote: > On 2016-05-03 10.50, Mike Hommey wrote: >> - git fetch-pack --diag-url "$1" | grep -v host= | grep -v port= >actual >> && >> + git fetch-pack --diag-url "$1" | grep -v user= | grep -v host= | grep >> -v port=

Re: [PATCH 2/3] submodule deinit: lose requirement for giving '.'

2016-05-03 Thread Junio C Hamano
Stefan Beller writes: > The discussion in [1] realized that '.' is a faulty suggestion as > there is a corner case where it fails: > >> "submodule deinit ." may have "worked" in the sense that you would >> have at least one path in your tree and avoided this "nothing >>

Re: [PATCH v2 00/41] Add and use error_errno() and warning_errno()

2016-05-03 Thread Eric Sunshine
On Tue, May 3, 2016 at 8:03 AM, Nguyễn Thái Ngọc Duy wrote: > Changes are in > > [01/41] usage.c: move format processing out of die_errno() > [02/41] usage.c: add warning_errno() and error_errno() > [12/41] builtin/update-index.c: prefer "err" to "errno" in >

Re: [PATCH v2 12/41] builtin/update-index.c: prefer "err" to "errno" in process_lstat_error

2016-05-03 Thread Eric Sunshine
On Tue, May 3, 2016 at 8:03 AM, Nguyễn Thái Ngọc Duy wrote: > "errno" is already passed in as "err". Here we should use err instead of > errno. errno is probably a copy/paste mistake in e011054 (Teach > git-update-index about gitlinks - 2007-04-12) Thanks, this version is

remotes

2016-05-03 Thread Lev
Dear List, I accidentally added a remote of another repository to my config file. And so I merged two different repositories together. Is there any real user case for this? Is there any way to prevent this happening? Thanks, Lev

Re: [PATCH v4 01/11] add fetch-pack --diag-url tests for some corner cases

2016-05-03 Thread Torsten Bögershausen
On 2016-05-03 18.07, Junio C Hamano wrote: > Mike Hommey writes: > >> t5603-clone-dirname uses url patterns that are not tested with >> fetch-pack --diag-url, and it would be useful if they were. >> >> Interestingly, some of those tests, involving both a port and a >>

Re: [PATCH v4 09/11] connect: use "-l user" instead of "user@" on ssh command line

2016-05-03 Thread Torsten Bögershausen
On 2016-05-03 10.50, Mike Hommey wrote: > While it is not strictly necessary, it makes the connect code simpler > when there is user. > That commit message does't tell too much, I think. Besides that, I'm sure it will break (at least) my ssh wrapper scripts, which rely on user@host to be passed

Re: [PATCH 74/83] builtin/apply: make try_create_file() return -1 on error

2016-05-03 Thread Christian Couder
On Mon, May 2, 2016 at 8:01 PM, Eric Sunshine wrote: > On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder > wrote: >> Signed-off-by: Christian Couder >> --- >> diff --git a/builtin/apply.c b/builtin/apply.c >> @@

Re: [PATCH v4 08/11] connect: change the --diag-url output to separate user and host

2016-05-03 Thread Torsten Bögershausen
On 2016-05-03 10.50, Mike Hommey wrote: > Signed-off-by: Mike Hommey > --- > connect.c | 6 ++ > t/t5500-fetch-pack.sh | 14 -- > 2 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/connect.c b/connect.c > index e95e385..2c5b722

Re: [PATCH 1/3] submodule deinit test: fix broken && chain in subshell

2016-05-03 Thread Junio C Hamano
Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > t/t7400-submodule-basic.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh > index 814ee63..90d80d3 100755 > ---

Re: [PATCH v15 7/7] t/t7507: tests for broken behavior of status

2016-05-03 Thread Pranit Bauva
On Tue, May 3, 2016 at 9:47 PM, Eric Sunshine wrote: > On Tue, May 3, 2016 at 5:18 AM, Pranit Bauva wrote: >> On Tue, May 3, 2016 at 12:19 PM, Eric Sunshine >> wrote: > Step back a moment and recall why these tests

Re: [PATCH v15 7/7] t/t7507: tests for broken behavior of status

2016-05-03 Thread Eric Sunshine
On Tue, May 3, 2016 at 5:18 AM, Pranit Bauva wrote: > On Tue, May 3, 2016 at 12:19 PM, Eric Sunshine > wrote: Step back a moment and recall why these tests were added. Earlier rounds of this series were buggy and caused regressions in

Re: [PATCH v4 01/11] add fetch-pack --diag-url tests for some corner cases

2016-05-03 Thread Torsten Bögershausen
On 2016-05-03 10.50, Mike Hommey wrote: > diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh > index e5f83bf..1f0133f 100755 > --- a/t/t5500-fetch-pack.sh > +++ b/t/t5500-fetch-pack.sh > @@ -569,12 +569,27 @@ check_prot_host_port_path () { > test_cmp expected actual > } > > -for r

Re: [PATCH v4 01/11] add fetch-pack --diag-url tests for some corner cases

2016-05-03 Thread Junio C Hamano
Mike Hommey writes: > t5603-clone-dirname uses url patterns that are not tested with > fetch-pack --diag-url, and it would be useful if they were. > > Interestingly, some of those tests, involving both a port and a > user:password pair, don't currently pass. Note that even if

Re: [PATCH v8 10/10] ce_compare_data() did not respect conversion

2016-05-03 Thread Torsten Bögershausen
On 2016-05-02 21.33, Junio C Hamano wrote: > Junio C Hamano writes: > Let's step back a bit and make sure we are on the same page. I > think this "series" conflates a bit too many things into a single > topic. > > * The comparison between the index and the working tree, i.e.

Re: [PATCH v15 7/7] t/t7507: tests for broken behavior of status

2016-05-03 Thread Junio C Hamano
Eric Sunshine writes: One previous commit (title: commit: add a commit.verbose config variable) introduced a new config variable named commit.verbose, so care should be taken that it would not affect the behavior of status. Another previous

Re: [PATCH v3 2/2] travis-ci: build documentation

2016-05-03 Thread Junio C Hamano
Lars Schneider writes: > On 02 May 2016, at 22:45, Junio C Hamano wrote: > >> larsxschnei...@gmail.com writes: >> >>> +set -e >>> + >>> +LINKS=$(grep --recursive --only-matching --no-filename --perl-regexp \ >>> +'(?<=linkgit:).*?(?=\[\d+\])'

Re: [PATCH v3 1/2] Documentation: fix linkgit references

2016-05-03 Thread Junio C Hamano
Lars Schneider writes: > On 02 May 2016, at 22:34, Jeff King wrote: > >> On Mon, May 02, 2016 at 10:20:04PM +0200, larsxschnei...@gmail.com wrote: >> >>> From: Lars Schneider >>> >>> Signed-off-by: Lars Schneider

Re: [PATCH 82/83] environment: add set_index_file()

2016-05-03 Thread Junio C Hamano
Christian Couder writes: > +void set_index_file(char *index_file) > +{ > + git_index_file = index_file; > +} What's the rationale for this change, and more importantly, the ownership rule for the string? When you call this function, does the caller still own

Re: [PATCH 73/83] builtin/apply: make write_out_results() return -1 on error

2016-05-03 Thread Christian Couder
On Mon, May 2, 2016 at 7:42 PM, Eric Sunshine wrote: > On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder > wrote: >> Signed-off-by: Christian Couder >> --- >> diff --git a/builtin/apply.c b/builtin/apply.c >> @@

Re: [PATCH 69/83] builtin/apply: make add_conflicted_stages_file() return -1 on error

2016-05-03 Thread Christian Couder
On Mon, May 2, 2016 at 9:36 AM, Eric Sunshine wrote: > On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder > wrote: >> Signed-off-by: Christian Couder >> --- >> diff --git a/builtin/apply.c b/builtin/apply.c >> @@

Re: [PATCH 67/83] builtin/apply: make build_fake_ancestor() return -1 on error

2016-05-03 Thread Christian Couder
On Mon, May 2, 2016 at 9:32 AM, Eric Sunshine wrote: > On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder > wrote: >> Signed-off-by: Christian Couder >> --- >> diff --git a/builtin/apply.c b/builtin/apply.c >> @@

Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-05-03 Thread Christian Couder
On Sun, May 1, 2016 at 11:03 PM, Eric Sunshine wrote: >> @@ -4590,10 +4590,10 @@ static int apply_all_patches(struct apply_state >> *state, >> squelched); >> } >> if (state->ws_error_action ==

[PATCH v2] gitweb: apply fallback encoding before highlight

2016-05-03 Thread Shin Kojima
Some multi-byte character encodings (such as Shift_JIS and GBK) have characters whose final bytes is an ASCII '\' (0x5c), and they will be displayed as funny-characters even if $fallback_encoding is correct. This is because `highlight` command always expects UTF-8 encoded strings from STDIN.

Re: [PATCH 81/83] apply: roll back index in case of error

2016-05-03 Thread Christian Couder
Hi Dscho, On Mon, Apr 25, 2016 at 6:06 PM, Johannes Schindelin wrote: > Hi Chris, > > On Sun, 24 Apr 2016, Christian Couder wrote: > >> @@ -4734,16 +4737,22 @@ int apply_all_patches(struct apply_state *state, >> read_stdin = 0; >>

[PATCH v4.1 11/11] connect: move ssh command line preparation to a separate function

2016-05-03 Thread Mike Hommey
--- connect.c | 109 ++ 1 file changed, 59 insertions(+), 50 deletions(-) Err, I had forgotten to commit --amend to add a missing argument. diff --git a/connect.c b/connect.c index 215d6d9..5f86983 100644 --- a/connect.c +++

[PATCH v2 34/41] sequencer.c: use error_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- sequencer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index e66f2fe..4687ad4 100644 --- a/sequencer.c +++ b/sequencer.c @@ -875,8 +875,7 @@ static int sequencer_rollback(struct

[PATCH v2 32/41] rerere.c: use error_errno() and warning_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- rerere.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/rerere.c b/rerere.c index c8b9f40..1810c04 100644 --- a/rerere.c +++ b/rerere.c @@ -501,8 +501,7 @@ static int handle_file(const char *path,

[PATCH v2 22/41] diff-no-index.c: use error_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- diff-no-index.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index 03daadb..1f8999b 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -65,8 +65,7 @@ static int

  1   2   >