Re: [PATCH v2 1/1] remote-curl.c: xcurl_off_t is not portable (on 32 bit platfoms)

2018-11-11 Thread Torsten Bögershausen
On Mon, Nov 12, 2018 at 12:50:30PM +0900, Junio C Hamano wrote: > tbo...@web.de writes: > > > > > This is a re-semd, the orignal patch was part of a 2 > > patch-series. > > This patch needed some rework, and here should be > > the polished version. > > Will queue. Thanks, is there a chance to

Re: [PATCH 2/2] built-in rebase: reinstate `checkout -q` behavior where appropriate

2018-11-11 Thread Junio C Hamano
Johannes Schindelin writes: >> > static int reset_head(struct object_id *oid, const char *action, >> > -const char *switch_to_branch, int detach_head, >> > +const char *switch_to_branch, >> > +int detach_head, int reset_hard, >> >> It might be

Re: [PATCH v2 1/1] Update .mailmap

2018-11-11 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > This patch makes the output of `git shortlog -nse v2.10.0..master` > duplicate-free. > > Signed-off-by: Johannes Schindelin > --- Thanks, will queue.

Re: [PATCH v2 1/1] remote-curl.c: xcurl_off_t is not portable (on 32 bit platfoms)

2018-11-11 Thread Junio C Hamano
tbo...@web.de writes: > > This is a re-semd, the orignal patch was part of a 2 > patch-series. > This patch needed some rework, and here should be > the polished version. Will queue. Next time, please refrain from saying "re-send", if you changed anything in the patch (or the log message), as

Re: [PATCH v4 3/3] range-diff: make diff option behavior (e.g. --stat) consistent

2018-11-11 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh > index ab44e085d5..9352f65280 100755 > --- a/t/t3206-range-diff.sh > +++ b/t/t3206-range-diff.sh > @@ -140,37 +140,15 @@ test_expect_success 'changed commit with --stat diff > option' ' > 1:

Re: [PATCH v4 3/3] range-diff: make diff option behavior (e.g. --stat) consistent

2018-11-11 Thread Junio C Hamano
Eric Sunshine writes: > On Fri, Nov 9, 2018 at 5:18 AM Ævar Arnfjörð Bjarmason > wrote: >> Make the behavior when diff options (e.g. "--stat") are passed >> consistent with how "diff" behaves. >> [...] >> Signed-off-by: Ævar Arnfjörð Bjarmason >> --- >> diff --git a/range-diff.c

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-11 Thread Junio C Hamano
Duy Nguyen writes: > FWIW I don't have any preference, as long as the variable can still > have a name (that is not a symbol). Same here. > A side question regardless of syntax. What do we do with > %(unrecognized name)/foo? I see three options > > - expand to empty, so "/foo" > - keep it

Re: [PATCH 03/10] fast-export: use value from correct enum

2018-11-11 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 11 2018, Jeff King wrote: > On Sat, Nov 10, 2018 at 10:23:05PM -0800, Elijah Newren wrote: > >> ABORT and ERROR happen to have the same value, but come from differnt >> enums. Use the one from the correct enum. > > Yikes. :) > > This is a good argument for naming these

Re: [PATCH] builtin/notes: remove unnecessary free

2018-11-11 Thread Johan Herland
On Sun, Nov 11, 2018 at 10:49 AM Carlo Marcelo Arenas Belón wrote: > > 511726e4b1 ("builtin/notes: fix premature failure when trying to add > the empty blob", 2014-11-09) removed the check for !len but left a > call to free the buffer that will be otherwise NULL > > Signed-off-by: Carlo Marcelo

Re: [PATCH v2 1/1] Upcast size_t variables to uintmax_t when printing

2018-11-11 Thread Torsten Bögershausen
On Sun, Nov 11, 2018 at 02:28:35AM -0500, Jeff King wrote: > On Sun, Nov 11, 2018 at 08:05:04AM +0100, tbo...@web.de wrote: > > > From: Torsten Bögershausen > > > > When printing variables which contain a size, today "unsigned long" > > is used at many places. > > In order to be able to change

Re: [PATCH 00/10] fast export and import fixes and features

2018-11-11 Thread Elijah Newren
On Sat, Nov 10, 2018 at 11:27 PM Jeff King wrote: > > On Sat, Nov 10, 2018 at 10:23:02PM -0800, Elijah Newren wrote: > > > This is a series of ten patches representing two doc corrections, one > > pedantic fix, three real bug fixes, one micro code refactor, and three > > new features. Each of

Re: [PATCH v4 3/3] range-diff: make diff option behavior (e.g. --stat) consistent

2018-11-11 Thread Eric Sunshine
On Fri, Nov 9, 2018 at 5:18 AM Ævar Arnfjörð Bjarmason wrote: > Make the behavior when diff options (e.g. "--stat") are passed > consistent with how "diff" behaves. > [...] > Signed-off-by: Ævar Arnfjörð Bjarmason > --- > diff --git a/range-diff.c b/range-diff.c > @@ -453,7 +453,8 @@ int

Re: [PATCH 10/10] fast-export: add --always-show-modify-after-rename

2018-11-11 Thread Elijah Newren
On Sat, Nov 10, 2018 at 11:23 PM Jeff King wrote: > > On Sat, Nov 10, 2018 at 10:23:12PM -0800, Elijah Newren wrote: > > > fast-export output is traditionally used as an input to a fast-import > > program, but it is also useful to help gather statistics about the > > history of a repository

Re: [PATCH 09/10] fast-export: add a --show-original-ids option to show original names

2018-11-11 Thread Elijah Newren
On Sat, Nov 10, 2018 at 11:20 PM Jeff King wrote: > > On Sat, Nov 10, 2018 at 10:23:11PM -0800, Elijah Newren wrote: > > > Knowing the original names (hashes) of commits, blobs, and tags can > > sometimes enable post-filtering that would otherwise be difficult or > > impossible. In particular,

Re: [PATCH 07/10] fast-export: ensure we export requested refs

2018-11-11 Thread Elijah Newren
On Sat, Nov 10, 2018 at 11:02 PM Jeff King wrote: > > On Sat, Nov 10, 2018 at 10:23:09PM -0800, Elijah Newren wrote: > > > If file paths are specified to fast-export and a ref points to a commit > > that does not touch any of the relevant paths, then that ref would > > sometimes fail to be

Re: [PATCH 06/10] fast-export: when using paths, avoid corrupt stream with non-existent mark

2018-11-11 Thread Elijah Newren
On Sat, Nov 10, 2018 at 10:53 PM Jeff King wrote: > > On Sat, Nov 10, 2018 at 10:23:08PM -0800, Elijah Newren wrote: > > > If file paths are specified to fast-export and multiple refs point to a > > commit that does not touch any of the relevant file paths, then > > fast-export can hit problems.

Re: [PATCH 04/10] fast-export: avoid dying when filtering by paths and old tags exist

2018-11-10 Thread Elijah Newren
On Sat, Nov 10, 2018 at 10:44 PM Jeff King wrote: > > On Sat, Nov 10, 2018 at 10:23:06PM -0800, Elijah Newren wrote: > > > If --tag-of-filtered-object=rewrite is specified along with a set of > > paths to limit what is exported, then any tags pointing to old commits > > that do not contain any of

Re: [PATCH v2 1/1] Upcast size_t variables to uintmax_t when printing

2018-11-10 Thread Jeff King
On Sun, Nov 11, 2018 at 08:05:04AM +0100, tbo...@web.de wrote: > From: Torsten Bögershausen > > When printing variables which contain a size, today "unsigned long" > is used at many places. > In order to be able to change the type from "unsigned long" into size_t > some day in the future, we

Re: [PATCH 00/10] fast export and import fixes and features

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:02PM -0800, Elijah Newren wrote: > This is a series of ten patches representing two doc corrections, one > pedantic fix, three real bug fixes, one micro code refactor, and three > new features. Each of these ten changes is relatively small in size. > These changes

Re: [PATCH 10/10] fast-export: add --always-show-modify-after-rename

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:12PM -0800, Elijah Newren wrote: > fast-export output is traditionally used as an input to a fast-import > program, but it is also useful to help gather statistics about the > history of a repository (particularly when --no-data is also passed). > For example, two of

Re: [PATCH 09/10] fast-export: add a --show-original-ids option to show original names

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:11PM -0800, Elijah Newren wrote: > Knowing the original names (hashes) of commits, blobs, and tags can > sometimes enable post-filtering that would otherwise be difficult or > impossible. In particular, the desire to rewrite commit messages which > refer to other

Re: [PATCH 02/10] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-10 Thread Elijah Newren
On Sat, Nov 10, 2018 at 10:36 PM Jeff King wrote: > > On Sat, Nov 10, 2018 at 10:23:04PM -0800, Elijah Newren wrote: > > > Signed-off-by: Elijah Newren > > --- > > Documentation/git-fast-export.txt | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git

Re: [PATCH 08/10] fast-export: add --reference-excluded-parents option

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:10PM -0800, Elijah Newren wrote: > git filter-branch has a nifty feature allowing you to rewrite, e.g. just > the last 8 commits of a linear history > git filter-branch $OPTIONS HEAD~8..HEAD > > If you try the same with git fast-export, you instead get a history

Re: [PATCH 07/10] fast-export: ensure we export requested refs

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:09PM -0800, Elijah Newren wrote: > If file paths are specified to fast-export and a ref points to a commit > that does not touch any of the relevant paths, then that ref would > sometimes fail to be exported. (This depends on whether any ancestors > of the commit

Re: [PATCH 06/10] fast-export: when using paths, avoid corrupt stream with non-existent mark

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:08PM -0800, Elijah Newren wrote: > If file paths are specified to fast-export and multiple refs point to a > commit that does not touch any of the relevant file paths, then > fast-export can hit problems. fast-export has a list of additional refs > that it needs to

Re: [PATCH 05/10] fast-export: move commit rewriting logic into a function for reuse

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:07PM -0800, Elijah Newren wrote: > Logic to replace a filtered commit with an unfiltered ancestor is useful > elsewhere; put it into a function we can call. OK. I had to stare at it for a minute to make sure there was not an edge case with looking at "p" versus

Re: [PATCH 04/10] fast-export: avoid dying when filtering by paths and old tags exist

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:06PM -0800, Elijah Newren wrote: > If --tag-of-filtered-object=rewrite is specified along with a set of > paths to limit what is exported, then any tags pointing to old commits > that do not contain any of those specified paths cause problems. Since > the old tagged

Re: [PATCH 02/10] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:04PM -0800, Elijah Newren wrote: > Signed-off-by: Elijah Newren > --- > Documentation/git-fast-export.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-fast-export.txt > b/Documentation/git-fast-export.txt > index

Re: [PATCH 03/10] fast-export: use value from correct enum

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:05PM -0800, Elijah Newren wrote: > ABORT and ERROR happen to have the same value, but come from differnt > enums. Use the one from the correct enum. Yikes. :) This is a good argument for naming these SIGNED_TAG_ABORT, etc. But this is obviously an improvement in

Re: [PATCH 01/10] git-fast-import.txt: fix documentation for --quiet option

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:03PM -0800, Elijah Newren wrote: > Signed-off-by: Elijah Newren > --- > Documentation/git-fast-import.txt | 7 --- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/Documentation/git-fast-import.txt > b/Documentation/git-fast-import.txt >

Re: [PATCH] p3400: replace calls to `git checkout -b' by `git checkout -B'

2018-11-10 Thread Johannes Schindelin
Hi Alban, On Fri, 9 Nov 2018, Alban Gruin wrote: > p3400 makes a copy of the current repository to test git-rebase > performance, and creates new branches in the copy with `git checkout > -b'. If the original repository has branches with the same name as the > script is trying to create, this

Re: [PATCH] coccicheck: introduce 'pending' semantic patches

2018-11-10 Thread Martin Ågren
On Sat, 10 Nov 2018 at 01:10, Stefan Beller wrote: > I dialed back on the workflow, as we may want to explore it first > before writing it down. Makes sense. FWIW, this iteration looks good to me. Martin

Re: [PATCH v5 10/12] Add a base implementation of SHA-256 support

2018-11-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Nov 07 2018, brian m. carlson wrote: > On Mon, Nov 05, 2018 at 12:39:14PM +0100, Ævar Arnfjörð Bjarmason wrote: >> On Sun, Nov 04 2018, brian m. carlson wrote: >> > + { >> > + "sha256", >> > + /* "s256", big-endian */ >> >> The existing entry/comment for sha1 is: >>

Re: [PATCH v2 12/16] parse-options: replace opterror() with optname()

2018-11-10 Thread Ramsay Jones
On 10/11/2018 04:55, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 3:07 PM Ramsay Jones > wrote: >> Also, this patch does not replace opterror() calls outside of >> the 'parse-options.c' file with optname(). This tickles my >> static-check.pl script, since optname() is an external function >>

Re: [PATCH v2 15/16] fsck: reduce word legos to help i18n

2018-11-09 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 4:41 AM Junio C Hamano wrote: > > static int fsck_error_func(struct fsck_options *o, > > struct object *obj, int type, const char *message) > > { > > - objreport(obj, (type == FSCK_WARN) ? "warning" : "error", message); > > - return (type == FSCK_WARN) ? 0 :

Re: [PATCH v2 12/16] parse-options: replace opterror() with optname()

2018-11-09 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 3:07 PM Ramsay Jones wrote: > Also, this patch does not replace opterror() calls outside of > the 'parse-options.c' file with optname(). This tickles my > static-check.pl script, since optname() is an external function > which is only called from 'parse-options.c'. > > So,

Re: [PATCH] Makefile: add pending semantic patches

2018-11-09 Thread Stefan Beller
On Thu, Nov 8, 2018 at 9:18 PM Junio C Hamano wrote: > > Stefan Beller writes: > > > From: SZEDER Gábor > > > > Add a description and place on how to use coccinelle for large refactorings > > that happen only once. > > > > Based-on-work-by: SZEDER Gábor > > Signed-off-by: Stefan Beller > >

Re: [PATCH] Makefile: add pending semantic patches

2018-11-09 Thread Stefan Beller
On Thu, Nov 8, 2018 at 8:56 PM Martin Ågren wrote: > I haven't followed the original discussion too carefully, so I'll read > this like someone new to the topic probably would. Thanks! > A nit, perhaps, but I was genuinely confused at first. The subject is > "Makefile: add pending semantic

Re: [PATCH 2/2] built-in rebase: reinstate `checkout -q` behavior where appropriate

2018-11-09 Thread Jeff King
On Fri, Nov 09, 2018 at 06:21:41PM +0100, Johannes Schindelin wrote: > Actually, you got me thinking about the desc.buffer. And I think there is > one corner case where it could cause a problem: `struct tree_desc desc[2]` > does not initialize the buffers to NULL. And what if >

Re: [PATCH v1 1/1] Upcast size_t variables to uintmax_t when printing

2018-11-09 Thread Eric Sunshine
On Fri, Nov 9, 2018 at 9:46 AM wrote: > When printing variables which contains a size, today "unsigned long" > is used at many places. > In order to be able to change the type from "unsigned long" into size_t > some day the future, we need to have a way to print 64 bit variables s/day/& in/ >

Re: [PATCH 2/2] built-in rebase: reinstate `checkout -q` behavior where appropriate

2018-11-09 Thread Johannes Schindelin
Hi Peff, On Fri, 9 Nov 2018, Jeff King wrote: > On Fri, Nov 09, 2018 at 01:34:19AM -0800, Johannes Schindelin via > GitGitGadget wrote: > > > From: Johannes Schindelin > > > > When we converted a `git checkout -q $onto^0` call to use > > `reset_head()`, we inadvertently incurred a change

Re: [PATCH 1/2] rebase: consolidate clean-up code before leaving reset_head()

2018-11-09 Thread Johannes Schindelin
Hi Peff, On Fri, 9 Nov 2018, Jeff King wrote: > On Fri, Nov 09, 2018 at 01:34:17AM -0800, Johannes Schindelin via > GitGitGadget wrote: > > > diff --git a/builtin/rebase.c b/builtin/rebase.c > > index 0ee06aa363..6f6d7de156 100644 > > --- a/builtin/rebase.c > > +++ b/builtin/rebase.c > > @@

Re: [PATCH v4 0/3] range-diff fixes

2018-11-09 Thread Johannes Schindelin
Hi Ævar, On Fri, 9 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > Addresses feedback on v3, especially Eric's suggestion to split out > the behavior change (which I was not aware of) into a 3/3. For the record, I am fine with this iteration, too. Ciao, Dscho

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-09 Thread Duy Nguyen
On Fri, Nov 9, 2018 at 11:19 AM Jeff King wrote: > > The form `/abc/def` would not be confused with anything > > that it is not, I would think. The only thing against this form (at least > > that I can think of) is that some people use this way to talk about paths > > that vary between different

Re: [PATCH v4 3/3] range-diff: make diff option behavior (e.g. --stat) consistent

2018-11-09 Thread Stephen & Linda Smith
On Friday, November 9, 2018 3:18:03 AM MST Ævar Arnfjörð Bjarmason wrote: > > But we should behave consistently with "diff" in anticipation of such > output being useful in the future, because it would make for confusing > UI if two "diff" and "range-diff" behaved differently when it came to 's/

Re: [PATCH] travis-ci: install packages in 'ci/install-dependencies.sh'

2018-11-09 Thread Johannes Schindelin
Hi, On Fri, 9 Nov 2018, Junio C Hamano wrote: > SZEDER Gábor writes: > > >> > I'm not sure about the last paragraph, because: > >> > > >> > - It talks about presumed benefits for a currently still > >> > work-in-progress patch series of an other contributor, and I'm not > >> > really

Re: [PATCH 1/1] Update .mailmap

2018-11-09 Thread Johannes Schindelin
Hi Junio, On Fri, 9 Nov 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > From: Johannes Schindelin > > > > This patch makes the output of `git shortlog -nse v2.10.0` > > duplicate-free. > > Did you mean "v2.10.0..master" or did you really mean this covers

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-09 Thread Jeff King
On Fri, Nov 09, 2018 at 02:05:48AM +, Joseph Moisan wrote: > Can someone please tell me how to unsubscribe from this email. I am > no longer interested in receiving these emails, and cannot find how to > unsubscribe. Details are at http://vger.kernel.org/vger-lists.html#git. -Peff

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-09 Thread Jeff King
On Thu, Nov 08, 2018 at 04:45:16PM +0100, Johannes Schindelin wrote: > > One thing I had in mind when proposing $VARIABLE is that it opens up a > > namespace for us to expand more things (*) for example $GIT_DIR (from > > ~/.gitconfig). > > > > (*) but in a controlled way, it may look like an

Re: [PATCH 2/2] built-in rebase: reinstate `checkout -q` behavior where appropriate

2018-11-09 Thread Jeff King
On Fri, Nov 09, 2018 at 01:34:19AM -0800, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > When we converted a `git checkout -q $onto^0` call to use > `reset_head()`, we inadvertently incurred a change from a twoway_merge > to a oneway_merge, as if we wanted a `git

Re: [PATCH 1/2] rebase: consolidate clean-up code before leaving reset_head()

2018-11-09 Thread Jeff King
On Fri, Nov 09, 2018 at 01:34:17AM -0800, Johannes Schindelin via GitGitGadget wrote: > diff --git a/builtin/rebase.c b/builtin/rebase.c > index 0ee06aa363..6f6d7de156 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -569,16 +569,13 @@ static int reset_head(struct object_id *oid,

Re: [PATCH v3 2/2] range-diff: fix regression in passing along diff options

2018-11-08 Thread Ævar Arnfjörð Bjarmason
On Fri, Nov 09 2018, Eric Sunshine wrote: > On Thu, Nov 8, 2018 at 5:34 PM Ævar Arnfjörð Bjarmason > wrote: >> On Thu, Nov 08 2018, Eric Sunshine wrote: >> > Looking at diff.c:parse_diff_opt() and enable_patch_output(), rather >> > than introducing this new conditional, I'm thinking that a

Re: [PATCH v3 2/2] range-diff: fix regression in passing along diff options

2018-11-08 Thread Eric Sunshine
On Thu, Nov 8, 2018 at 5:34 PM Ævar Arnfjörð Bjarmason wrote: > On Thu, Nov 08 2018, Eric Sunshine wrote: > > Looking at diff.c:parse_diff_opt() and enable_patch_output(), rather > > than introducing this new conditional, I'm thinking that a more > > correct fix would be: > > > >

Re: [PATCH] Makefile: add pending semantic patches

2018-11-08 Thread Junio C Hamano
Stefan Beller writes: > From: SZEDER Gábor > > Add a description and place on how to use coccinelle for large refactorings > that happen only once. > > Based-on-work-by: SZEDER Gábor > Signed-off-by: Stefan Beller > --- > > I consider including this patch in a resend instead. > It outlays the

Re: [PATCH] Makefile: add pending semantic patches

2018-11-08 Thread Martin Ågren
On Thu, 8 Nov 2018 at 21:53, Stefan Beller wrote: > > From: SZEDER Gábor > I haven't followed the original discussion too carefully, so I'll read this like someone new to the topic probably would. A nit, perhaps, but I was genuinely confused at first. The subject is "Makefile: add pending

Re: [PATCH v7 1/1] http: add support selecting http version

2018-11-08 Thread Junio C Hamano
"Force Charlie via GitGitGadget" writes: > +http.version:: > + Use the specified HTTP protocol version when communicating with a > server. > + If you want to force the default. The available and default version > depend > + on libcurl. Actually the possible values of > + this

Re: [PATCH] travis-ci: install packages in 'ci/install-dependencies.sh'

2018-11-08 Thread Junio C Hamano
SZEDER Gábor writes: >> > I'm not sure about the last paragraph, because: >> > >> > - It talks about presumed benefits for a currently still >> > work-in-progress patch series of an other contributor, and I'm not >> > really sure that that's a good thing. Perhaps I should have >> >

Re: [PATCH v6 1/1] http: add support selecting http version

2018-11-08 Thread Junio C Hamano
Eric Sunshine writes: >> @@ -284,6 +285,9 @@ static void process_curl_messages(void) >> static int http_options(const char *var, const char *value, void *cb) >> { >> + if (!strcmp("http.version",var)) { > > Style: space after comma > >> + return

Re: [PATCH v6 1/1] http: add support selecting http version

2018-11-08 Thread Junio C Hamano
"Force Charlie via GitGitGadget" writes: > +#if LIBCURL_VERSION_NUM >=0x072f00 > +static int get_curl_http_version_opt(const char *version_string, long *opt) > +{ > + int i; > + static struct { > + const char *name; > + long opt_token; > + } choice[] = { > +

Re: [PATCH 1/1] Update .mailmap

2018-11-08 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > This patch makes the output of `git shortlog -nse v2.10.0` > duplicate-free. Did you mean "v2.10.0..master" or did you really mean this covers authors recorded up to v2.10.0? Judging from the cover letter, I think

RE: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Joseph Moisan
-Original Message- From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf Of Junio C Hamano Sent: Wednesday, November 7, 2018 7:17 PM To: Ramsay Jones Cc: Johannes Schindelin ; Johannes Schindelin via GitGitGadget ; git@vger.kernel.org Subject: Re: [PATCH 1/1] mingw: handle

Re: [PATCH v3 2/2] range-diff: fix regression in passing along diff options

2018-11-08 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 08 2018, Eric Sunshine wrote: > On Wed, Nov 7, 2018 at 7:22 AM Ævar Arnfjörð Bjarmason > wrote: >> In 73a834e9e2 ("range-diff: relieve callers of low-level configuration >> burden", 2018-07-22) we broke passing down options like --no-patch, >> --stat etc. Fix that regression, and

Re: [PATCH] travis-ci: install packages in 'ci/install-dependencies.sh'

2018-11-08 Thread SZEDER Gábor
On Fri, Nov 02, 2018 at 11:25:17AM +0900, Junio C Hamano wrote: > SZEDER Gábor writes: > > > Ever since we started using Travis CI, we specified the list of > > packages to install in '.travis.yml' via the APT addon. While running > > our builds on Travis CI's container-based infrastructure we

Re: [PATCH 1/2] ls-remote: do not send ref prefixes for patterns

2018-11-08 Thread Jonathan Tan
> Jeff King writes: > > > Since b4be74105f (ls-remote: pass ref prefixes when requesting a > > remote's refs, 2018-03-15), "ls-remote foo" will pass "refs/heads/foo", > > "refs/tags/foo", etc to the transport code in an attempt to let the > > other side reduce the size of its advertisement. > >

Re: [PATCH v3] i18n: make GETTEXT_POISON a runtime option

2018-11-08 Thread SZEDER Gábor
On Thu, Nov 08, 2018 at 09:26:19PM +0100, Ævar Arnfjörð Bjarmason wrote: > On Fri, Nov 02 2018, SZEDER Gábor wrote: > >> * We error out in the Makefile if you're still saying > >>GETTEXT_POISON=YesPlease. > >> > >>This makes more sense than just making it a synonym since now this > >>

Re: [PATCH v3] i18n: make GETTEXT_POISON a runtime option

2018-11-08 Thread Ævar Arnfjörð Bjarmason
On Fri, Nov 02 2018, SZEDER Gábor wrote: > On Thu, Nov 01, 2018 at 07:31:15PM +, Ævar Arnfjörð Bjarmason wrote: >> Change the GETTEXT_POISON compile-time + runtime GIT_GETTEXT_POISON >> test parameter to only be a GIT_TEST_GETTEXT_POISON= >> runtime parameter, to be consistent with other

Re: [PATCH v3] i18n: make GETTEXT_POISON a runtime option

2018-11-08 Thread Eric Sunshine
On Wed, Nov 7, 2018 at 10:24 PM Junio C Hamano wrote: > Makefile: ease dynamic-gettext-poison transition > > Earlier we made the entire build to fail when GETTEXT_POISON=Yes is > given to make, to notify those who did not notice that text poisoning > is now a runtime behaviour. > > It turns out

Re: [PATCH v6 1/1] http: add support selecting http version

2018-11-08 Thread Eric Sunshine
On Thu, Nov 8, 2018 at 2:00 AM Force Charlie via GitGitGadget wrote: > In order to give users the freedom to control the HTTP version, > we need to add a setting to choose which HTTP version to use. > > Signed-off-by: Force Charlie > --- > diff --git a/http.c b/http.c > @@ -284,6 +285,9 @@

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Eric Sunshine
On Thu, Nov 8, 2018 at 10:45 AM Johannes Schindelin wrote: > On Thu, 8 Nov 2018, Duy Nguyen wrote: > > One thing I had in mind when proposing $VARIABLE is that it opens up a > > namespace for us to expand more things (*) for example $GIT_DIR (from > > ~/.gitconfig). > > > > (*) but in a

Re: [PATCH v3 2/2] range-diff: fix regression in passing along diff options

2018-11-08 Thread Eric Sunshine
On Wed, Nov 7, 2018 at 7:22 AM Ævar Arnfjörð Bjarmason wrote: > In 73a834e9e2 ("range-diff: relieve callers of low-level configuration > burden", 2018-07-22) we broke passing down options like --no-patch, > --stat etc. Fix that regression, and add a test for some of these > options being passed

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Johannes Schindelin
Hi Junio, On Thu, 8 Nov 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > But now I have a really crazy idea: how about ~~/ssl/certs/ca-bundle.crt? > > The `~` prefix is *already* a reserved character,... > > We would need to prepare for a future where we need yet another >

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Johannes Schindelin
Hi Duy, On Thu, 8 Nov 2018, Duy Nguyen wrote: > On Thu, Nov 8, 2018 at 2:14 PM Johannes Schindelin > wrote: > > > > On Wed, 7 Nov 2018, Jeff King wrote: > > > > > All that said, if we're just interested in allowing this for config, > > > then we already have such a wrapper function:

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Johannes Schindelin
Hi Junio, On Thu, 8 Nov 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Thu, 8 Nov 2018, Junio C Hamano wrote: > > > >> I am tempted to say "///" might also be such a > >> way, even in the POSIX world, but am not brave enough to do so, as I > >> suspect that may have a

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Junio C Hamano
Johannes Schindelin writes: > But now I have a really crazy idea: how about ~~/ssl/certs/ca-bundle.crt? > The `~` prefix is *already* a reserved character,... We would need to prepare for a future where we need yet another special thing to be expanded, and it will quickly become cryptic if you

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Junio C Hamano
Johannes Schindelin writes: > Hi, > > On Thu, 8 Nov 2018, Junio C Hamano wrote: > >> I am tempted to say "///" might also be such a >> way, even in the POSIX world, but am not brave enough to do so, as I >> suspect that may have a fallout in the Windows world X-<. > > It does. //server/share is

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Duy Nguyen
On Thu, Nov 8, 2018 at 2:14 PM Johannes Schindelin wrote: > > Hi Peff, > > On Wed, 7 Nov 2018, Jeff King wrote: > > > All that said, if we're just interested in allowing this for config, > > then we already have such a wrapper function: git_config_pathname(). > > Good point. I agree that

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Johannes Schindelin
Hi Peff, On Wed, 7 Nov 2018, Jeff King wrote: > All that said, if we're just interested in allowing this for config, > then we already have such a wrapper function: git_config_pathname(). Good point. I agree that `git_config_pathname()` is a better home for this feature than

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-08 Thread Johannes Schindelin
Hi, On Thu, 8 Nov 2018, Junio C Hamano wrote: > I am tempted to say "///" might also be such a > way, even in the POSIX world, but am not brave enough to do so, as I > suspect that may have a fallout in the Windows world X-<. It does. //server/share is the way we refer to UNC paths (AKA network

Re: [PATCH v2 0/2] Reimplement rebase --merge via interactive machinery

2018-11-07 Thread Elijah Newren
On Wed, Nov 7, 2018 at 10:02 PM Elijah Newren wrote: > > Now that the rewrite-interactive-rebases-in-C series have finally > merged to master, this series deletes git-rebase--merge.sh and > reimplements the --merge behavior on top of the interactive machinery. > > Differences since v1: > -

Re: [PATCH v3 0/4] http: add support selecting http version

2018-11-07 Thread Junio C Hamano
"Force.Charlie-I via GitGitGadget" writes: > Normally, git doesn't need to set curl to select the HTTP version, it works > fine without HTTP/2. Adding HTTP/2 support is a icing on the cake. > > This patch support force enable HTTP/2 or HTTP/1.1. > > example: > > GIT_CURL_VERBOSE=1 git2 -c

Re: [PATCH v5 10/10] merge-recursive: combine error handling

2018-11-07 Thread Junio C Hamano
Elijah Newren writes: > From: Derrick Stolee > > In handle_rename_rename_1to2(), we have duplicated error handling > around colliding paths. Specifically, when we want to write out > the file and there is a directory or untracked file in the way, > we need to create a temporary file to hold the

Re: [PATCH] branch: make --show-current use already resolved HEAD

2018-11-07 Thread Rafael Ascensão
I did something that resulted in the mailing list not being cc'd. Apologies to Junio and Daniels for the double send. :( On Thu, Nov 08, 2018 at 10:11:02AM +0900, Junio C Hamano wrote: > I'd prefer to see scriptors avoid using "git branch", too. > > Unlike end-user facing documentation where we

Re: [PATCH 0/1] http: add support selecting http version

2018-11-07 Thread Junio C Hamano
"brian m. carlson" writes: > On Wed, Nov 07, 2018 at 02:44:51PM +0100, Daniel Stenberg wrote: >> On Wed, 7 Nov 2018, Force.Charlie-I via GitGitGadget wrote: >> >> > Normally, git doesn't need to set curl to select the HTTP version, it >> > works fine without HTTP2. Adding HTTP2 support is a

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Junio C Hamano
Jeff King writes: > So if we are comfortable with saying that this is a new feature to have > the machine-readable trailer version, and there isn't a robust way to > get historical revert information (because there really isn't[1]), then > I think we can just punt on any kind of

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-07 Thread Junio C Hamano
Jeff King writes: > I think we would want to carefully think about the call in enter_repo(). > We do not want git-daemon to accidentally expose repositories in > $RUNTIME_PREFIX. > > Looking over the code, I think this is OK. The expansion happens in > enter_repo(), and then we take the path

Re: [PATCH v3] i18n: make GETTEXT_POISON a runtime option

2018-11-07 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > * We error out in the Makefile if you're still saying >GETTEXT_POISON=YesPlease. I expected this would be irritating, but it turns out it is worse than mere irritation but is a severe hinderance to affect my performance, as I (and my bots) keep building

Re: [PATCH 1/1] http: add support selecting http version

2018-11-07 Thread Junio C Hamano
"Force Charlie via GitGitGadget" writes: > From: Force Charlie > > Signed-off-by: Force Charlie > --- > http.c | 12 > 1 file changed, 12 insertions(+) > > diff --git a/http.c b/http.c > index 3dc8c560d6..99cb04faba 100644 > --- a/http.c > +++ b/http.c > @@ -48,6 +48,7 @@ char

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Jeff King
On Thu, Nov 08, 2018 at 09:36:56AM +0900, Junio C Hamano wrote: > Duy Nguyen writes: > > > There is still one thing to settle. "revert -m1" could produce > > something like this > > > > This reverts commit , reversing > > changes made to . > > I do not think it is relevant, with or

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-07 Thread Jeff King
On Thu, Nov 08, 2018 at 09:30:15AM +0900, Junio C Hamano wrote: > Jeff King writes: > > > On Wed, Nov 07, 2018 at 10:36:52PM +0100, Johannes Sixt wrote: > > > > All that said, if we're just interested in allowing this for config, > > then we already have such a wrapper function:

Re: [PATCH 0/1] http: add support selecting http version

2018-11-07 Thread brian m. carlson
On Wed, Nov 07, 2018 at 02:44:51PM +0100, Daniel Stenberg wrote: > On Wed, 7 Nov 2018, Force.Charlie-I via GitGitGadget wrote: > > > Normally, git doesn't need to set curl to select the HTTP version, it > > works fine without HTTP2. Adding HTTP2 support is a icing on the cake. > > Just a FYI: >

Re: [PATCH] branch: make --show-current use already resolved HEAD

2018-11-07 Thread Junio C Hamano
Rafael Ascensão writes: > print_current_branch_name() tries to resolve HEAD and die() when it > doesn't resolve it successfully. But the conditions being tested are > always unreachable because early in branch:cmd_branch() the same logic > is performed. > > Eliminate the duplicate and

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Junio C Hamano
Duy Nguyen writes: > There is still one thing to settle. "revert -m1" could produce > something like this > > This reverts commit , reversing > changes made to . I do not think it is relevant, with or without multiple parents, to even attempt to read this message. The description is

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-07 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 07, 2018 at 10:36:52PM +0100, Johannes Sixt wrote: > > All that said, if we're just interested in allowing this for config, > then we already have such a wrapper function: git_config_pathname(). > > So I don't think it's a big deal to implement it in any of these

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-07 Thread Junio C Hamano
Ramsay Jones writes: >> The cute thing is: your absolute paths would not be moved because we are >> talking about Windows. Therefore your absolute paths would not start with >> a forward slash. > > Ah, sorry, I must have misunderstood a comment in your cover letter: > > The reason is this:

Re: [PATCH v3 1/2] range-diff doc: add a section about output stability

2018-11-07 Thread Junio C Hamano
Stephen & Linda Smith writes: >> +This is particularly true when passing in diff options. Currently some >> +options like `--stat` can as an emergent effect produce output that's > > "`--stat` can as an emergent": I read that for times to decided it was > correct > grammar. Should it be

Re: [PATCH v2] format-patch: respect --stat in cover letter's diffstat

2018-11-07 Thread Laszlo Ersek
On 11/07/18 17:49, Nguyễn Thái Ngọc Duy wrote: > Commit 43662b23ab (format-patch: keep cover-letter diffstat wrapped in > 72 columns - 2018-01-24) uncondtionally sets stat width to 72 when > generating diffstat for the cover letter, ignoring --stat from command > line. But it should only do so

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-07 Thread Jeff King
On Wed, Nov 07, 2018 at 10:36:52PM +0100, Johannes Sixt wrote: > Am 07.11.18 um 21:41 schrieb Jeff King: > > On Wed, Nov 07, 2018 at 07:52:28PM +0100, Johannes Sixt wrote: > > > Do I understand correctly, that you use a leading slash as an indicator to > > > construct a path relative to

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-07 Thread Johannes Sixt
Am 07.11.18 um 21:41 schrieb Jeff King: On Wed, Nov 07, 2018 at 07:52:28PM +0100, Johannes Sixt wrote: Do I understand correctly, that you use a leading slash as an indicator to construct a path relative to system_path(). How about a "reserved" user name? For example, [http] sslcert =

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Jeff King
On Wed, Nov 07, 2018 at 04:30:38PM +0100, Duy Nguyen wrote: > > Could we help the reading scripts by normalizing old and new output via > > interpret-trailers, %(trailers), etc? > > > > I think "(cherry picked from ...)" is already considered a trailer by > > the trailer code. If the caller

Re: [PATCH 2/2] built-in rebase --autostash: leave the current branch alone if possible

2018-11-07 Thread Jeff King
On Wed, Nov 07, 2018 at 06:00:50AM -0800, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > When we converted a `git reset --hard` call in the original Unix shell > script to built-in code, we asked to reset the worktree and the index > and explicitly *not* to detach

<    4   5   6   7   8   9   10   11   12   13   >