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

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

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

[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: [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: 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 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 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 v15 7/7] t/t7507: tests for broken behavior of status

2016-05-03 Thread Pranit Bauva
On Tue, May 3, 2016 at 10:42 AM, Eric Sunshine wrote: > On Mon, May 2, 2016 at 11:39 PM, Pranit Bauva wrote: >> On Tue, May 3, 2016 at 4:37 AM, Junio C Hamano wrote: >>> Pranit Bauva writes:

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 2:42 AM, Pranit Bauva wrote: > On Tue, May 3, 2016 at 10:42 AM, Eric Sunshine > wrote: >> On Mon, May 2, 2016 at 11:39 PM, Pranit Bauva wrote: >>> I agree that using test_expect_failure would be a

[PATCH v4 05/11] connect: make parse_connect_url() return separated host and port

2016-05-03 Thread Mike Hommey
Now that nothing besides CONNECT_DIAG_URL is using hostandport, we can have parse_connect_url() itself do the host and port splitting. This still leaves "user@" part of the host, if there is one, which will be addressed in a subsequent change. This however does add /some/ handling of the "user@"

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

2016-05-03 Thread Mike Hommey
Signed-off-by: Mike Hommey --- connect.c | 109 ++ 1 file changed, 59 insertions(+), 50 deletions(-) diff --git a/connect.c b/connect.c index 215d6d9..37b3140 100644 --- a/connect.c +++ b/connect.c @@ -673,6 +673,62

[PATCH v4 00/11] connect: various cleanups

2016-05-03 Thread Mike Hommey
I went even further this time around. I'm not totally satistifed with the resulting parse_connect_url function, but at least it feels to me this series puts us in a better place to actually improve it further. Mike Hommey (11): add fetch-pack --diag-url tests for some corner cases connect:

[PATCH v4 02/11] connect: call get_host_and_port() earlier

2016-05-03 Thread Mike Hommey
Currently, get_host_and_port() is called in git_connect() for the ssh protocol, and in git_tcp_connect_sock() for the git protocol. Instead of doing this, just call it from a single place, right after parse_connect_url(), and pass the host and port separately to git_*_connect() functions. We

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

2016-05-03 Thread Mike Hommey
While it is not strictly necessary, it makes the connect code simpler when there is user. Signed-off-by: Mike Hommey --- connect.c| 12 t/t5601-clone.sh | 52 2 files changed, 48 insertions(+), 16

[PATCH v4 06/11] connect: group CONNECT_DIAG_URL handling code

2016-05-03 Thread Mike Hommey
Previous changes made both branches handling CONNECT_DIAG_URL identical. We can now remove one of those branches and have CONNECT_DIAG_URL be handled in one place. Signed-off-by: Mike Hommey --- connect.c | 16 +--- 1 file changed, 1 insertion(+), 15 deletions(-)

[PATCH v4 03/11] connect: only match the host with core.gitProxy

2016-05-03 Thread Mike Hommey
Currently, core.gitProxy doesn't actually match purely on domain names as documented: it also matches ports. So a core.gitProxy value like "script for kernel.org" doesn't make the script called for an url like git://kernel.org:port/path, while it is called for git://kernel.org/path. This

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

2016-05-03 Thread Lars Schneider
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 >> --- > > Fix how? Your commit message

[PATCH v4 07/11] connect: make parse_connect_url() return the user part of the url as a separate value

2016-05-03 Thread Mike Hommey
Signed-off-by: Mike Hommey --- connect.c | 37 + 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/connect.c b/connect.c index 8813f90..e95e385 100644 --- a/connect.c +++ b/connect.c @@ -588,11 +588,13 @@ static char

[PATCH v4 04/11] connect: fill the host header in the git protocol with the host and port variables

2016-05-03 Thread Mike Hommey
The last use of the hostandport variable, besides being strdup'ed before being split into host and port, is to fill the host header in the git protocol. Instead of relying on parse_connect_url() to return a host:port string that makes sense there, construct one from the host and port variables.

[PATCH v4 10/11] connect: actively reject git:// urls with a user part

2016-05-03 Thread Mike Hommey
Currently, urls of the for git://user@host don't work because user@host is not resolving at the DNS level, but we shouldn't be relying on it being an invalid host name, and actively reject it for containing a username in the first place. Signed-off-by: Mike Hommey ---

Re: [PATCH 01/41] usage.c: move format processing out of die_errno()

2016-05-03 Thread Duy Nguyen
On Tue, May 3, 2016 at 11:45 AM, Jeff King wrote: > On Mon, May 02, 2016 at 11:26:02AM -0700, Junio C Hamano wrote: > >> Caller supplied buffer would be the way to go when multiple threads >> could be showing errors and warnings, right? >> >> It would not make too much of a

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

2016-05-03 Thread Mike Hommey
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 a user:password pair is actually not supported by

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

2016-05-03 Thread Mike Hommey
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 100644 --- a/connect.c +++ b/connect.c @@ -703,10 +703,8 @@

[PATCH] git-multimail: update to release 1.3.0

2016-05-03 Thread Matthieu Moy
The changes are described in CHANGES. Contributions-by: Matthieu Moy Contributions-by: Stefan Tatschner Contributions-by: Simon P Contributions-by: Leander Hasty Signed-off-by: Matthieu Moy

Re: [PATCH 01/41] usage.c: move format processing out of die_errno()

2016-05-03 Thread Jeff King
On Tue, May 03, 2016 at 04:39:45PM +0700, Duy Nguyen wrote: > On Tue, May 3, 2016 at 11:45 AM, Jeff King wrote: > > On Mon, May 02, 2016 at 11:26:02AM -0700, Junio C Hamano wrote: > > > >> Caller supplied buffer would be the way to go when multiple threads > >> could be showing

Re: [PATCH] remote.c: specify correct plural form in "commit diverge" message

2016-05-03 Thread Duy Nguyen
On Tue, May 3, 2016 at 11:48 AM, Jeff King wrote: > On Tue, May 03, 2016 at 11:43:41AM +0700, Duy Nguyen wrote: > >> On Tue, May 3, 2016 at 11:20 AM, Jeff King wrote: >> > Note that I do not think the singular case can ever trigger with your >> > new code. We know

Re: [PATCH v2] Documentation: add setup instructions for Travis CI

2016-05-03 Thread Lars Schneider
On 02 May 2016, at 10:48, Matthieu Moy wrote: > larsxschnei...@gmail.com writes: > >> +on open source projects), you can use their Travis CI integration to >> +test your changes on Linux, Mac, and (hopefully soon) Windows. See > > Nit: I'd write Linux, Mac (and

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

2016-05-03 Thread Lars Schneider
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+\])' Documentation/* \ >> +| sort -u \ >> +) >> + >> +for LINK

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 12:19 PM, Eric Sunshine wrote: > On Tue, May 3, 2016 at 2:42 AM, Pranit Bauva wrote: >> On Tue, May 3, 2016 at 10:42 AM, Eric Sunshine >> wrote: >>> On Mon, May 2, 2016 at 11:39 PM, Pranit Bauva

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

2016-05-03 Thread Jan Keromnes
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 https://www.kernel.org/pub/software/scm/git/git-2.8.2.tar.xz | tar xJ \ && cd

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

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

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

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

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

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] 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: 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] t5510: run auto-gc in the foreground

2016-05-03 Thread SZEDER Gábor
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 index 38321d19efbe..454d896390c0 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@

[PATCH v2 04/41] builtin/am.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 --- builtin/am.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index d003939..3dfe70b 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -769,15 +769,15 @@ static int

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

2016-05-03 Thread Nguyễn Thái Ngọc Duy
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] compat/win32/syslog.c: use warning_errno() [27/41] grep.c: use

[PATCH v2 03/41] bisect.c: use die_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 --- bisect.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bisect.c b/bisect.c index 7996c29..6d93edb 100644 --- a/bisect.c +++ b/bisect.c @@ -860,8 +860,8 @@ static void check_good_are_ancestors_of_bad(const

[PATCH v2 01/41] usage.c: move format processing out of die_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
fmt_with_err() will be shared with the coming error_errno() and warning_errno(). Signed-off-by: Nguyễn Thái Ngọc Duy --- usage.c | 27 --- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/usage.c b/usage.c index 82ff131..8675d72 100644

[PATCH v2 02/41] usage.c: add warning_errno() and error_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Similar to die_errno(), these functions will append strerror() automatically. Signed-off-by: Nguyễn Thái Ngọc Duy --- git-compat-util.h | 2 ++ usage.c | 21 + 2 files changed, 23 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h

[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

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 v2 11/41] builtin/rm.c: use warning_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
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 +++ b/builtin/rm.c @@ -152,7 +152,7 @@ static int check_local_mod(unsigned char

[PATCH v2 08/41] builtin/mailsplit.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 --- builtin/mailsplit.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c index 104277a..4859ede 100644 --- a/builtin/mailsplit.c +++ b/builtin/mailsplit.c @@ -109,7

[PATCH v2 13/41] builtin/upload-archive.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 --- builtin/upload-archive.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index dbfe14f..2caedf1 100644 --- a/builtin/upload-archive.c +++

[PATCH v2 10/41] builtin/pack-objects.c: use die_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 --- builtin/pack-objects.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index a27de5b..e18e190 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@

[PATCH v2 05/41] builtin/branch.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 --- builtin/branch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0adba62..6f1572d 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -593,8 +593,7 @@ static int

[PATCH v2 06/41] builtin/fetch.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 --- builtin/fetch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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

[PATCH v2 07/41] builtin/help.c: use warning_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/help.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/help.c b/builtin/help.c index 3c55ce4..8848013 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -127,7 +127,7 @@ static void

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

2016-05-03 Thread Nguyễn Thái Ngọc Duy
"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) Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/update-index.c | 2 +- 1 file changed, 1

[PATCH v2 29/41] ident.c: use warning_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- ident.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ident.c b/ident.c index 4fd82d1..139c528 100644 --- a/ident.c +++ b/ident.c @@ -75,14 +75,12 @@ static int add_mailname_host(struct strbuf *buf)

[PATCH v2 37/41] transport-helper.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 --- transport-helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index b934183..f09fadc 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1166,7 +1166,7 @@

[PATCH v2 35/41] server-info.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 --- server-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-info.c b/server-info.c index 5a86e29..75dd677 100644 --- a/server-info.c +++ b/server-info.c @@ -36,7 +36,7 @@ static int update_info_file(char

[PATCH v2 28/41] http.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 --- http.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/http.c b/http.c index 4304b80..7565c93 100644 --- a/http.c +++ b/http.c @@ -446,8 +446,7 @@ static int sockopt_callback(void *client, curl_socket_t fd,

[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

[PATCH v2 26/41] gpg-interface.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 --- gpg-interface.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gpg-interface.c b/gpg-interface.c index 2259938..c4b1e8c 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -219,11 +219,9 @@ int

[PATCH v2 23/41] editor.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 --- editor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/editor.c b/editor.c index 01c644c..7519ede 100644 --- a/editor.c +++ b/editor.c @@ -63,7 +63,6 @@ int launch_editor(const char *path, struct strbuf *buffer,

[PATCH v2 18/41] config.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 --- config.c | 22 +- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/config.c b/config.c index 10b5c95..80411e4 100644 --- a/config.c +++ b/config.c @@ -2012,7 +2012,7 @@ int

[PATCH v2 24/41] entry.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 --- entry.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/entry.c b/entry.c index a410957..519e042 100644 --- a/entry.c +++ b/entry.c @@ -168,8 +168,8 @@ static int write_entry(struct cache_entry *ce,

[PATCH v2 40/41] vcs-svn: use error_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- vcs-svn/line_buffer.c| 4 ++-- vcs-svn/sliding_window.c | 2 +- vcs-svn/svndiff.c| 4 ++-- vcs-svn/svndump.c| 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vcs-svn/line_buffer.c

[PATCH v2 38/41] unpack-trees.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 --- unpack-trees.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 9f55cc2..bb0d142 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1499,8 +1499,7 @@ static int

[PATCH v2 41/41] wrapper.c: use warning_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- wrapper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrapper.c b/wrapper.c index 9afc1a0..3df2fe0 100644 --- a/wrapper.c +++ b/wrapper.c @@ -572,7 +572,7 @@ static int warn_if_unremovable(const char *op,

[PATCH v2 09/41] builtin/merge-file.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 --- builtin/merge-file.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 5544705..13e22a2 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -62,8

[PATCH v2 19/41] connected.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 --- connected.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/connected.c b/connected.c index 299c560..bf1b12e 100644 --- a/connected.c +++ b/connected.c @@ -86,17 +86,14 @@ static int

[PATCH v2 16/41] combine-diff.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 --- combine-diff.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index 0e1d4b0..8f2313d 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1005,8 +1005,7 @@ static void

[PATCH v2 17/41] compat/win32/syslog.c: use warning_errno()

2016-05-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- compat/win32/syslog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c index b905aea..6c7c9b6 100644 --- a/compat/win32/syslog.c +++ b/compat/win32/syslog.c @@ -28,13

[PATCH v2 20/41] copy.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 --- copy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/copy.c b/copy.c index 574fa1f..4de6a11 100644 --- a/copy.c +++ b/copy.c @@ -42,15 +42,15 @@ int copy_file(const char *dst, const char *src, int mode)

  1   2   >