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

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", > > + "side-band-64k", > > + "ofs-delta", > > + "shallow", > >

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

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: >>> Variable named 'verbose' in builtin/commit.c is consumed by git-status >>> and git-commit

Re: [PATCH 1/6] connect: remove get_port()

On Tue, May 03, 2016 at 01:03:38AM -0400, Jeff King wrote: > On Sun, May 01, 2016 at 12:10:09PM +0200, Torsten Bögershausen wrote: > > > On 2016-05-01 08.02, Mike Hommey wrote: > > > get_port() is only used as a fallback when get_host_and_port() does not > > > return a port. But get_port() does

Re: [PATCH 1/6] connect: remove get_port()

On Sun, May 01, 2016 at 12:10:09PM +0200, Torsten Bögershausen wrote: > On 2016-05-01 08.02, Mike Hommey wrote: > > get_port() is only used as a fallback when get_host_and_port() does not > > return a port. But get_port() does the same search as > > get_host_and_port(), except get_host_and_port()

Re: [PATCH jk/push-client-deadlock-fix] Windows: add pthread_sigmask() that does nothing

On Sun, May 01, 2016 at 09:08:21PM +0200, Johannes Sixt wrote: > A previous change introduced a call to pthread_sigmask() in order to block > SIGPIPE in a thread. Since there are no signal facilities on Windows that > are similar to POSIX signals, just ignore the request to block the signal. > In

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

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 that both "ours" and "theirs" are non-zero to get to > > this message,

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

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 difference for die(), though. I think it can matter for die(). This is

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

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 that both "ours" and "theirs" are non-zero to get to > this message, which means "ours + theirs" must be at least 2 (barring > negative

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

On Tue, May 03, 2016 at 07:20:27AM +0700, Duy Nguyen wrote: > > I think it needs to be max(ours, theirs) > > > > "Your branch and '%s' have diverged,\n" > > "and have 1 and 1 different commit each, " > > > > so singular for that too, no? > > I thought that would be "1 and 1 commits".

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

On Mon, May 2, 2016 at 5:59 PM, Junio C Hamano wrote: > ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) introduced a > "signed commit" by teaching --[no-gpg-sign option and commit.gpgsign s/\[no/[no]/ (ditto in the "simpler" patch) > configuration variable to various

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

On Mon, May 02, 2016 at 02:58:45PM -0700, Junio C Hamano wrote: > ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) introduced a > "signed commit" by teaching --[no-gpg-sign option and commit.gpgsign > configuration variable to various commands that create commits. > > Teaching these to

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

On Tue, May 3, 2016 at 4:37 AM, Junio C Hamano wrote: > Pranit Bauva writes: > >> Variable named 'verbose' in builtin/commit.c is consumed by git-status >> and git-commit so if a new verbose related behavior is introduced in >> git-commit, then it

Re: [PATCH v2] git-stash: Don't GPG sign when stashing changes

On Mon, May 2, 2016 at 4:56 PM, Daurnimator wrote: > On 3 May 2016 at 07:57, Junio C Hamano wrote: > > I agree quiltimport should not, but I think filter-branch possibly > should... at least for your *own* commits. > I often think of filter-branch as an

Re: [PATCH 04/10] shell helpers usage: always send help to stderr

It also is somewhat sad that you needed to refer to a random blog you found on the Internet whose punch line was essentially what I already said before you finally decide to listen to me X-<. I somehow expected that over the years you worked with me you learned I had a reasonable taste in

Re: [PATCH 04/10] shell helpers usage: always send help to stderr

Stefan Beller writes: > git --help |grep pull > > instead of > > git --help 2>&1 |grep pull Not just that. It makes me sad that it is unpredictable which stream a project happens to have chosen to send its help text and I end up almost always doing

Re: [PATCH 03/14] upload-pack-2: Implement the version 2 of upload-pack

On Tue, May 3, 2016 at 1:56 AM, David Turner wrote: > On Mon, 2016-05-02 at 10:51 -0700, Stefan Beller wrote: >> On Mon, May 2, 2016 at 10:43 AM, David Turner < >> dtur...@twopensource.com> wrote: >> > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: >> > > In

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

On Tue, May 3, 2016 at 7:16 AM, Stefan Beller wrote: > On Mon, May 2, 2016 at 5:12 PM, Nguyễn Thái Ngọc Duy > wrote: >> We need to count both "ours" and "theirs" commits when selecting plural >> form for this message. Note that even though in this block,

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

On Mon, May 2, 2016 at 5:12 PM, Nguyễn Thái Ngọc Duy wrote: > We need to count both "ours" and "theirs" commits when selecting plural > form for this message. Note that even though in this block, both ours > and theirs must be positive (i.e. can't be in singular form), we still

Re: [PATCH] Move test-* to t/helper/ subdirectory

On Tue, May 3, 2016 at 12:34 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> I may have rushed to judgement. wrap-for-bin.sh has always been the >> dependency for bin-wrappers/*. If we force that file to change, then >> bin-wrappers/* will be recreated

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

We need to count both "ours" and "theirs" commits when selecting plural form for this message. Note that even though in this block, both ours and theirs must be positive (i.e. can't be in singular form), we still keep Q_(singular, plural) because languages other than English may have more than one

Re: [PATCH v2] git-stash: Don't GPG sign when stashing changes

On 3 May 2016 at 07:57, Junio C Hamano wrote: > I do not think this is particularly a good change. > > There are a few other in-tree users of "git commit-tree", > e.g. quiltimport and filter-branch, and their users would be hurt > the same way if they set commit.gpgsign in the

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

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 @@ -682,6 +682,7 @@ test_expect_success

bug: incorrect plurality of "commit" in git status

[debian-vm]$ gt On branch feat/junit-test Your branch and 'origin/feat/junit-test' have diverged, and have 19 and 1 different commit each, respectively. Should be "commits"-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

Re: [PATCH 04/10] shell helpers usage: always send help to stderr

On Mon, May 2, 2016 at 4:28 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> `git submodule asdf` would trigger displaying the usage of the submodule >> command on stderr, however `git submodule -h` would display the usage on >> stdout. Unify

Re: [PATCH 06/10] submodule deinit: send messages to stderr

Stefan Beller writes: > Reroute the output of stdout to stderr as it is just informative > messages, not to be consumed by machines. > > This should not regress any scripts that try to parse the > current output, as the output is already internationalized > and therefore

Re: [PATCH 04/10] shell helpers usage: always send help to stderr

Stefan Beller writes: > `git submodule asdf` would trigger displaying the usage of the submodule > command on stderr, however `git submodule -h` would display the usage on > stdout. Unify displaying help for shell commands on stderr. The primary output from "git cmd --help"

Re: [PATCH 05/10] submodule add: send messages to stderr

Stefan Beller writes: > Reroute the output of stdout to stderr as it is just informative > messages, not to be consumed by machines. > > This should not regress any scripts that try to parse the > current output, as the output is already internationalized > and therefore

Re: [PATCH 2/6] connect: uniformize and group CONNECT_DIAG_URL handling code

Junio C Hamano writes: > Torsten Bögershausen writes: > >> git://host:[port]/path/to/repo >> Knowing that, the "@" will be feed into the name resolver, >> and that's OK. > > Is it OK? It is plausible that our client side may even want to > accept

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

Pranit Bauva writes: > Variable named 'verbose' in builtin/commit.c is consumed by git-status > and git-commit so if a new verbose related behavior is introduced in > git-commit, then it should not affect the behavior of git-status. > > One previous commit (title: commit:

Re: [PATCH] git-stash: add flag to skip "git reset --hard"

Tom Anderson writes: > On 05/02/2016 12:58 PM, Junio C Hamano wrote: >> Tom Anderson writes: >> >>> Yes, but I like my stashes to be saved in the ref namespace. >> Isn't that something you can do so yourself with store_stash? > > What I want

[PATCH 3/3] submodule init: redirect stdout to stderr

Reroute the output of stdout to stderr as it is just informative messages, not to be consumed by machines. This should not regress any scripts that try to parse the current output, as the output is already internationalized and therefore unstable. We want to init submodules from the helper for

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

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 --- a/t/t7400-submodule-basic.sh +++

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

These patches build on top of origin/sb/submodule-init and are preparatoy for the submodule groups series. Junio asked to send these preparatory patches as its own series to have a better mental focus when reviewing the groups series later. When sending out a similar series end of last week[1], I

Re: [PATCH 2/6] connect: uniformize and group CONNECT_DIAG_URL handling code

Torsten Bögershausen writes: > git://host:[port]/path/to/repo > Knowing that, the "@" will be feed into the name resolver, > and that's OK. Is it OK? It is plausible that our client side may even want to accept git://user:pass@host:port/local/part, and as an anonymous service,

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

ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) introduced a "signed commit" by teaching --[no-gpg-sign option and commit.gpgsign configuration variable to various commands that create commits. Teaching these to "git commit" and "git merge", both of which are end-user facing Porcelain

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

ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) introduced a "signed commit" by teaching --[no-gpg-sign option and commit.gpgsign configuration variable to various commands that create commits. Teaching these to "git commit" and "git merge", both of which are end-user facing Porcelain

Re: [PATCH v2] git-stash: Don't GPG sign when stashing changes

Cameron Currie writes: > This is helpful for folks with commit.gpgsign = true in their .gitconfig. > > Signed-off-by: Cameron Currie > --- I do not think this is particularly a good change. There are a few other in-tree users of "git

[PATCH v2] git-stash: Don't GPG sign when stashing changes

This is helpful for folks with commit.gpgsign = true in their .gitconfig. Signed-off-by: Cameron Currie --- git-stash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index c7c65e2..fcf01b9 100755 --- a/git-stash.sh

Re: [PATCH] git-stash: add flag to skip "git reset --hard"

What I want can be achieved using "git stash store `git stash create`" On 05/02/2016 12:58 PM, Junio C Hamano wrote: Tom Anderson writes: Yes, but I like my stashes to be saved in the ref namespace. Isn't that something you can do so yourself with store_stash?

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

larsxschnei...@gmail.com writes: > +set -e > + > +LINKS=$(grep --recursive --only-matching --no-filename --perl-regexp \ > +'(?<=linkgit:).*?(?=\[\d+\])' Documentation/* \ > +| sort -u \ > +) > + > +for LINK in $LINKS; do > +echo "Checking linkgit:$LINK..." > +test -s

Re: [WIP PATCH 00/14] Protocol v2 patches

On Mon, May 2, 2016 at 1:41 PM, David Turner wrote: > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: >> Hi David, >> >> here are my patches for a protocol v2. >> >> ("Negotiate capabilities before doing anything else", or as code: >> >> static void

Re: [WIP PATCH 00/14] Protocol v2 patches

On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > Hi David, > > here are my patches for a protocol v2. > > ("Negotiate capabilities before doing anything else", or as code: > > static void upload_pack_version_2(void) > { > send_capabilities_version_2(); >

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

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 doesn't say why this is a good idea. Since this is v3, I'm guessing that

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

From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/config.txt| 6 +++--- Documentation/git-check-ignore.txt | 2 +- Documentation/git-filter-branch.txt | 4 ++-- Documentation/git-for-each-ref.txt | 2 +-

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

From: Lars Schneider Build documentation as separate Travis CI job to check for documentation errors. Signed-off-by: Lars Schneider --- .travis.yml | 15 +++ ci/test-documentation.sh | 24 2

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

From: Lars Schneider diff to v2: * remove file count check for generated documentation as it is too flaky * run `make doc` in `test-documentation.sh` to reduce the code in .travis.yml and ease the execution in other CI systems * add linkgit check * fix existing

Re: [PATCH] .mailmap: update to my shorter email address

Eric Wong writes: > Following f916ab0ccc ("send-email: more meaningful Message-ID"), > my own email address is too long :x Yuck. That sounds like a tail wagging the dog. I wouldn't insist you to use a particular name, but at least to me you'll forever be known as the

Re: [PATCH] git-stash: add flag to skip "git reset --hard"

Tom Anderson writes: > Yes, but I like my stashes to be saved in the ref namespace. Isn't that something you can do so yourself with store_stash? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

Re: [PATCH 12/14] Add test for fetch-pack

On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > +test_expect_success 'fetch-pack with protocol version 2' ' > + test_when_finished "rm -rf repo1" && > + mkdir repo1 && > + ( > + cd repo1 && > + git init && > + test_commit 1 && > +

Re: [PATCH] fix typo 'In such these cases'

> Re substance, I am wondering if "In such a case" might be better, by > the way. That is: > > A fast-forward is a special type of <> where you have a > <> and you are "merging" another > <>'s changes that happen to be

[PATCH] .mailmap: update to my shorter email address

Following f916ab0ccc ("send-email: more meaningful Message-ID"), my own email address is too long :x While I could have an even shorter address by one character with "yhbt.net", "80x24.org" is more representative of my hacking-related pursuits. Signed-off-by: Eric Wong

Re: [PATCH] fix typo 'In such these cases'

René Nyffenegger writes: >> René Nyffenegger writes: >> >>> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001 >>> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= >>> Date: Mon, 2 May 2016 09:19:46

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

Junio C Hamano writes: > Torsten Bögershausen writes: > >> On 29.04.16 23:09, Junio C Hamano wrote: >> >>> Well, didn't I do exactly the above much earlier and discarded it >>> because that breaks the definition of "diff"? Or is this doing >>> something

Re: [PATCH] fix typo 'In such these cases'

> René Nyffenegger writes: > >> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001 >> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= >> Date: Mon, 2 May 2016 09:19:46 +0200 >> Subject: [PATCH] Documentation: Fix typo 'In such

Re: [PATCHv5 1/2] http.c: implement the GIT_TRACE_CURL environment variable

On Mon, May 02, 2016 at 11:59:14AM -0700, Junio C Hamano wrote: > > +int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size, > > void *userp) > > +{ > > + const char *text; > > + (void)handle; /* prevent compiler unused parameter warning if > > checked */ > > +

Re: [PATCHv5 1/2] http.c: implement the GIT_TRACE_CURL environment variable

Elia Pinto writes: > +int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size, > void *userp) > +{ > + const char *text; > + (void)handle; /* prevent compiler unused parameter warning if > checked */ > + (void)userp;/*

Re: [PATCH] git-stash: add flag to skip "git reset --hard"

On 05/02/2016 11:42 AM, Junio C Hamano wrote: Tom Anderson writes: @@ -61,6 +61,9 @@ stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and

Re: [PATCH 08/14] fetch-pack: factor out get_selected_capabilities_list

On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > + struct string_list_item *item; > + get_selected_capabilities_list(, args); > + for_each_string_list_item(item, ) { > + strbuf_addstr(, " "); > +

Re: [PATCHv5 1/2] http.c: implement the GIT_TRACE_CURL environment variable

Elia Pinto writes: > +static void curl_dump(const char *text, unsigned char *ptr, size_t size, int > nopriv) > +{ > + size_t i; > + struct strbuf out = STRBUF_INIT; > + unsigned int width = 80; > + > + strbuf_addf(, "%s, %10.10ld bytes (0x%8.8lx)\n", > +

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

On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > +const char *known_capabilities[] = { > + "multi_ack", > + "thin-pack", > + "side-band", > + "side-band-64k", > + "ofs-delta", > + "shallow", > + "no-progress", > + "include-tag", > +

Re: [PATCH 03/14] upload-pack-2: Implement the version 2 of upload-pack

On Mon, 2016-05-02 at 10:51 -0700, Stefan Beller wrote: > On Mon, May 2, 2016 at 10:43 AM, David Turner < > dtur...@twopensource.com> wrote: > > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > > > In upload-pack-2 we send each capability in its own packet > > > buffer. > > > The

Re: [PATCH 04/14] connect: rewrite feature parsing to work on string_list

On Mon, May 2, 2016 at 11:18 AM, David Turner wrote: > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: >> + if (skip_prefix(item->string, "symref", )) { >> + if (!val) >> + continue; > > This if should

Re: [PATCH] fix typo 'In such these cases'

René Nyffenegger writes: > From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= > Date: Mon, 2 May 2016 09:19:46 +0200 > Subject: [PATCH] Documentation: Fix typo 'In such these

Re: [PATCH] git-stash: add flag to skip "git reset --hard"

Tom Anderson writes: > @@ -61,6 +61,9 @@ stashed and then cleaned up with `git clean`, > leaving the working directory > in a very clean state. If the `--all` option is used instead then the > ignored files are stashed and cleaned in addition to the untracked files.

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

Eric Sunshine writes: > On Sun, May 1, 2016 at 7:14 AM, Nguyễn Thái Ngọc Duy > wrote: >> fmt_with_err() will be shared with the coming error_errno() and >> warning_errno(). >> >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> diff

Re: [ANNOUNCE] Git v2.8.2

Johannes Schindelin writes: > ... However, I > decided to delay the release for a couple of days, for a couple of > reasons: > > - I expect an update of the Git Credential Manager in the next few days. > > - OpenSSL is slated to receive critical updates on Tuesday and

Re: [PATCH 04/14] connect: rewrite feature parsing to work on string_list

On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > + if (skip_prefix(item->string, "symref", )) { > + if (!val) > + continue; This if should never happen (skip_prefix returns 0 in that case). You probably meant !*val -- but: > +

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

Torsten Bögershausen writes: > On 29.04.16 23:09, Junio C Hamano wrote: > >> Well, didn't I do exactly the above much earlier and discarded it >> because that breaks the definition of "diff"? Or is this doing >> something differently? > > Yes, and I try to sneak it in anyway ;-)

Re: [PATCHv5 1/2] http.c: implement the GIT_TRACE_CURL environment variable

On Mon, May 02, 2016 at 02:28:12PM +, Elia Pinto wrote: > + if (nopriv && > + (skip_prefix(out.buf + prefix_len, "Authorization:", > ) > + || skip_prefix(out.buf + prefix_len, > "Proxy-Authorization:", ))) { > + /* The

Re: [PATCHv5 0/2] Implement the GIT_TRACE_CURL environment variable

On Mon, May 02, 2016 at 02:28:11PM +, Elia Pinto wrote: > - redo the authorization header skip with a replace of possible sensitive > data. >We prefer to print only: >09:00:53.238330 http.c:534 => Send header: Authorization: > >intested of >

Re: [PATCH v2] trailer: load config to handle core.commentChar

Eric Sunshine writes: > In fact, this is such a simple fix that the subject suggested above > may itself be a sufficient commit message; any extra text might just > be noise since the patch itself contains enough information to > understand the problem and the fix.

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

On Mon, May 2, 2016 at 7:49 PM, Junio C Hamano wrote: > Shin Kojima writes: > >> This patch prepare git blob objects to be encoded into UTF-8 before >> highlighting in the manner of `to_utf8` subroutine. >> --- > > The single liner Perl invoked from the script

Re: [PATCH 25/29] refs: resolve symbolic refs first

David Turner writes: > On Wed, 2016-04-27 at 18:57 +0200, Michael Haggerty wrote: > +retry: > ... >> +if (--attempts_remaining > 0) >> +goto retry; > > could this be a loop instead of using gotos? It could be, but given that there are

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

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 knob gets exposed it would have to become > > documented and maintained,

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

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 > @@ -4145,28 +4151,32 @@ static int try_create_file(const char *path, unsigned > int mode,

Re: [PATCH 19/29] refs: don't dereference on rename

Michael Haggerty writes: > The point is that `read_ref_full()` is now called with > `RESOLVE_REF_NO_RECURSE` turned on. So if `newrefname` is a symbolic > reference, then `read_ref_full()` sets `sha1` to zeros. Yes, that was an obvious rationale in the patch that was not

Re: [PATCH 03/14] upload-pack-2: Implement the version 2 of upload-pack

On Mon, May 2, 2016 at 10:43 AM, David Turner wrote: > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: >> In upload-pack-2 we send each capability in its own packet buffer. >> The construction of upload-pack-2 is a bit unfortunate as I would >> like >> it to not

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

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. This is because `highlight` command always

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

On Mon, May 2, 2016 at 10:40 AM, 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 knob gets exposed it would have to become >> documented and

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

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 > @@ -4381,7 +4387,7 @@ static int write_out_results(struct apply_state *state, > struct patch

Re: [PATCH 03/14] upload-pack-2: Implement the version 2 of upload-pack

On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > In upload-pack-2 we send each capability in its own packet buffer. > The construction of upload-pack-2 is a bit unfortunate as I would > like > it to not be depending on a symlink linking to upload-pack.c, but I > did > not find another

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

"Keller, Jacob E" writes: > True. I think the chances that it needs such a thing are quite minor, > and if an undocumented knob gets exposed it would have to become > documented and maintained, so I'd prefer to avoid it. Given that the > risk is pretty small I think

Re: [PATCH] Move test-* to t/helper/ subdirectory

Duy Nguyen writes: > I may have rushed to judgement. wrap-for-bin.sh has always been the > dependency for bin-wrappers/*. If we force that file to change, then > bin-wrappers/* will be recreated when switching branches. So how about > this? I do not think you are "force

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

Matthieu Moy writes: > 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 hopefully soon Windows).

Re: What's cooking in git.git (Apr 2016, #08; Fri, 29)

Ye Xiaolong writes: > On Fri, Apr 29, 2016 at 03:04:58PM -0700, Junio C Hamano wrote: >>* xy/format-patch-base (2016-04-26) 4 commits >> - format-patch: introduce format.useAutoBase configuration >> - format-patch: introduce --base=auto option >> - format-patch: add

Re: [PATCHv5 1/2] http.c: implement the GIT_TRACE_CURL environment variable

On 02/05/16 15:28, Elia Pinto wrote: [snip] > diff --git a/http.h b/http.h > index 36f558b..cd186a4 100644 > --- a/http.h > +++ b/http.h > @@ -225,4 +225,8 @@ extern int finish_http_object_request(struct > http_object_request *freq); > extern void abort_http_object_request(struct

Re: [PATCH 10/10] submodule deinit: complain when given a file instead of a submodule

On Mon, May 2, 2016 at 9:21 AM, Stefan Beller wrote: > On Mon, May 2, 2016 at 1:26 AM, Per Cederqvist wrote: >> After this change, what is the simplest way to programmatically >> deinit any submodule that may exist, without failing if there are >> none? >>

Re: [PATCH 10/10] submodule deinit: complain when given a file instead of a submodule

On Mon, May 2, 2016 at 1:26 AM, Per Cederqvist wrote: > After this change, what is the simplest way to programmatically > deinit any submodule that may exist, without failing if there are > none? > > "git commit" by default refuses to make an empty commit, but > it has the

Re: gitk: "lime" color incompatible with older Tk versions

+ Paul Mackerras, who maintains gitk On Sun, May 1, 2016 at 10:03 AM, Andrew Janke wrote: > Hi, git folks, > > I'm having trouble running gitk on Mac OS X 10.9.5. The gitk program uses > the color "lime", which is not present in older versions of Tk, apparently > including the

[PATCHv5 1/2] http.c: implement the GIT_TRACE_CURL environment variable

Implement the GIT_TRACE_CURL environment variable to allow a greater degree of detail of GIT_CURL_VERBOSE, in particular the complete transport header and all the data payload exchanged. It might be useful if a particular situation could require a more thorough debugging analysis. Document the new

[PATCHv5 0/2] Implement the GIT_TRACE_CURL environment variable

This is the fifth version but in reality is the complete rewriting of the patches discussed here (here called V1) $gmane/290520 $gmane/290521 *Changes from V4 ($gmane/292867) - add a better abstraction with the routine setup_curl_trace - curl_dump : drop the noex parameter, define nopriv

[PATCHv5 2/2] imap-send.c: introduce the GIT_TRACE_CURL environment variable

Permit the use of the GIT_TRACE_CURL environment variable calling the curl_trace and curl_dump http.c helper routine. Helped-by: Torsten Bögershausen Helped-by: Ramsay Jones Helped-by: Junio C Hamano Helped-by: Eric Sunshine

Re: [PATCH 2/6] connect: uniformize and group CONNECT_DIAG_URL handling code

On Mon, May 02, 2016 at 01:29:15PM +0200, Torsten Bögershausen wrote: > On 05/02/2016 10:31 AM, Mike Hommey wrote: > > On Mon, May 02, 2016 at 06:56:54AM +0200, Torsten Bögershausen wrote: > > > On 05/01/2016 08:02 AM, Mike Hommey wrote: > > > > + if (flags & CONNECT_DIAG_URL) { > > > >

Re: [PATCH 2/6] connect: uniformize and group CONNECT_DIAG_URL handling code

On 05/02/2016 10:31 AM, Mike Hommey wrote: On Mon, May 02, 2016 at 06:56:54AM +0200, Torsten Bögershausen wrote: On 05/01/2016 08:02 AM, Mike Hommey wrote: + if (flags & CONNECT_DIAG_URL) { printf("Diag: url=%s\n", url ? url : "NULL"); printf("Diag:

Re: [PATCH 12/41] builtin/update-index.c: use error_errno()

On Mon, May 2, 2016 at 1:40 AM, Eric Sunshine wrote: > On Sun, May 1, 2016 at 7:14 AM, Nguyễn Thái Ngọc Duy > wrote: >> "err" is deleted because it just causes confusion when "errno" is also >> used directly in process_lstat_error(). > > Despite the

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

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 hopefully soon Windows). Doesn't deserve a reroll IHMO. Other than that, the patch looks

Re: [PATCH 2/6] connect: uniformize and group CONNECT_DIAG_URL handling code

On Mon, May 02, 2016 at 06:56:54AM +0200, Torsten Bögershausen wrote: > On 05/01/2016 08:02 AM, Mike Hommey wrote: > > + if (flags & CONNECT_DIAG_URL) { > > printf("Diag: url=%s\n", url ? url : "NULL"); > > printf("Diag: protocol=%s\n", prot_name(protocol)); > >

Re: [PATCH 10/10] submodule deinit: complain when given a file instead of a submodule

After this change, what is the simplest way to programmatically deinit any submodule that may exist, without failing if there are none? "git commit" by default refuses to make an empty commit, but it has the --allow-empty option. "git rm -r ." by default fails if there are no files in the

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

From: Lars Schneider Also change UK english "behaviour" to US english "behavior". Signed-off-by: Lars Schneider --- diff to v1: * remind the reader to check documentation set formatting * do not call Travis CI as "our infrastructure" * do

[PATCH] fix typo 'In such these cases'

>From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= Date: Mon, 2 May 2016 09:19:46 +0200 Subject: [PATCH] Documentation: Fix typo 'In such these cases' Fix "In such these cases, ..." to "In such cases,

  1   2   >