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

2018-11-07 Thread Jeff King
On Wed, Nov 07, 2018 at 07:52:28PM +0100, Johannes Sixt wrote: > > Okay, now we know everything you find wrong with the current patch. Do you > > have any suggestion how to make it right? I.e. what would you suggest as a > > way to specify in a gitconfig in a portable Git where the certificate >

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

2018-11-07 Thread Martin Ågren
On Wed, 7 Nov 2018 at 13:22, Ævar Arnfjörð Bjarmason wrote: > + > +This is particularly true when passing in diff options. Currently some > +options like `--stat` can as an emergent effect produce output that's > +quite useless in the context of `range-diff`. Future versions of > +`range-diff`

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

2018-11-07 Thread Johannes Sixt
Am 07.11.18 um 12:23 schrieb Johannes Schindelin: On Tue, 6 Nov 2018, Johannes Sixt wrote: Am 06.11.18 um 15:53 schrieb Johannes Schindelin via GitGitGadget: Even if a path looks like a POSIX paths, i.e. it starts with a directory separator, but not with drive-letter-colon, it still has a

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

2018-11-07 Thread Ramsay Jones
On 07/11/2018 11:19, Johannes Schindelin wrote: [snip] >>> Hmm, this doesn't quite fit with the intended use of this >>> function! ;-) (even on windows!) >>> >>> I haven't looked very deeply, but doesn't this affect all >>> absolute paths in the config read by git_config_pathname(), >>> along

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

2018-11-07 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 11:11 PM Jeff King wrote: > > On Tue, Nov 06, 2018 at 06:48:22PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > The implementation looks fine to me, but as noted in > > https://public-inbox.org/git/8736se6qyc@evledraar.gmail.com/ I > > wonder what the plausible end-game

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

2018-11-07 Thread Daniel Stenberg
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: Starting with libcurl 7.62.0 (released a week ago), it now defaults to the

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

2018-11-07 Thread Stephen & Linda Smith
On Wednesday, November 7, 2018 5:22:01 AM MST Ævar Arnfjörð Bjarmason wrote: > +OUTPUT STABILITY > + > + > +The output of the `range-diff` command is subject to change. It is > +intended to be human-readable porcelain output, not something that can > +be used across versions of Git

Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-07 Thread Johannes Schindelin
Hi, On Wed, 7 Nov 2018, Junio C Hamano wrote: > Johannes Sixt writes: > > > Am 07.11.18 um 02:32 schrieb Junio C Hamano: > >> Johannes Sixt writes: > >>> On Linux, when I recompile for a different architecture, CFLAGS would > >>> change, so I would have thought that GIT-CFLAGS were the

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

2018-11-07 Thread Johannes Schindelin
Hi Hannes, On Tue, 6 Nov 2018, Johannes Sixt wrote: > Am 06.11.18 um 15:53 schrieb Johannes Schindelin via GitGitGadget: > > From: Johannes Schindelin > > > > On Windows, an absolute POSIX path needs to be turned into a Windows > > one. > > If I were picky, I would say that in a pure Windows

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

2018-11-07 Thread Johannes Schindelin
Hi, On Tue, 6 Nov 2018, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 3:55 PM Johannes Schindelin via GitGitGadget > wrote: > > > > From: Johannes Schindelin > > > > On Windows, an absolute POSIX path needs to be turned into a Windows > > one. > > > > Signed-off-by: Johannes Schindelin > > --- >

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

2018-11-07 Thread Johannes Schindelin
Hi, On Wed, 7 Nov 2018, Junio C Hamano wrote: > Ramsay Jones writes: > > > On 06/11/2018 14:53, Johannes Schindelin via GitGitGadget wrote: > >> From: Johannes Schindelin > >> > >> On Windows, an absolute POSIX path needs to be turned into a Windows > >> one. > >> > >> Signed-off-by:

Re: [PATCH v2] range-diff: add a --no-patch option to show a summary

2018-11-07 Thread Johannes Schindelin
Hi, On Wed, 7 Nov 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > diff --git a/builtin/range-diff.c b/builtin/range-diff.c > > index f01a0be851..05d1f6b6b6 100644 > > --- a/builtin/range-diff.c > > +++ b/builtin/range-diff.c > > @@ -16,11 +16,14 @@ int cmd_range_diff(int

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-07 Thread Johannes Schindelin
Me again, On Wed, 7 Nov 2018, Johannes Schindelin wrote: > On Wed, 7 Nov 2018, Johannes Schindelin wrote: > > > On Wed, 7 Nov 2018, Johannes Schindelin wrote: > > > > > On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > > > > > On Tue, Nov 06 2018, Johannes Schindelin wrote: > > > > >

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-07 Thread Johannes Schindelin
Hi Ævar, On Wed, 7 Nov 2018, Johannes Schindelin wrote: > On Wed, 7 Nov 2018, Johannes Schindelin wrote: > > > On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > > > On Tue, Nov 06 2018, Johannes Schindelin wrote: > > > > > > > On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > >

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-07 Thread Johannes Schindelin
Hi Ævar, On Wed, 7 Nov 2018, Johannes Schindelin wrote: > On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Nov 06 2018, Johannes Schindelin wrote: > > > > > On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > > > >> On Mon, Nov 05 2018, Eric Sunshine wrote: > > >> > > >> >

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-07 Thread Johannes Schindelin
Hi Ævar, On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Tue, Nov 06 2018, Johannes Schindelin wrote: > > > On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > >> On Mon, Nov 05 2018, Eric Sunshine wrote: > >> > >> > On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason > >> >

Re: [PATCH v2 1/1] pack-objects: ignore ambiguous object warnings

2018-11-07 Thread Jeff King
On Wed, Nov 07, 2018 at 05:52:05PM +0900, Junio C Hamano wrote: > Junio C Hamano writes: > > > The fix here is similar to 4c30d50 "rev-list: disable object/refname > > ambiguity check with --stdin". While the get_object_list() method > > reads the objects from stdin, turn

Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-07 Thread Junio C Hamano
Johannes Sixt writes: > Am 07.11.18 um 02:32 schrieb Junio C Hamano: >> Johannes Sixt writes: >>> On Linux, when I recompile for a different architecture, CFLAGS would >>> change, so I would have thought that GIT-CFLAGS were the natural >>> choice for a dependency. Don't they change in this

Re: [PATCH v2 1/1] pack-objects: ignore ambiguous object warnings

2018-11-07 Thread Junio C Hamano
Junio C Hamano writes: > The fix here is similar to 4c30d50 "rev-list: disable object/refname > ambiguity check with --stdin". While the get_object_list() method > reads the objects from stdin, turn warn_on_object_refname_ambiguity > flag (which is usually true) to false. Just for code

Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-06 Thread Johannes Sixt
Am 07.11.18 um 02:32 schrieb Junio C Hamano: Johannes Sixt writes: On Linux, when I recompile for a different architecture, CFLAGS would change, so I would have thought that GIT-CFLAGS were the natural choice for a dependency. Don't they change in this case on Windows, too? Depending on

Re: [PATCH 2/3] approxidate: handle pending number for "specials"

2018-11-06 Thread Junio C Hamano
Jeff King writes: > On Tue, Nov 06, 2018 at 04:48:28PM -0800, Carlo Arenas wrote: > > I think date_yesterday() is the only one of those special functions that > gets called like this. Here's what I think we should do to fix it (this > can go right on top of jk/misc-unused-fixes, which is already

Re: [PATCH v2 1/1] pack-objects: ignore ambiguous object warnings

2018-11-06 Thread Junio C Hamano
Jeff King writes: > So we'd never expect to see anything except "1" in our save_warning > variable. Doing a save/restore is just about code hygiene and > maintainability. Here is what I plan to queue. Thanks, both. -- >8 -- From: Derrick Stolee Date: Tue, 6 Nov 2018 12:34:47 -0800 Subject:

Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-06 Thread Junio C Hamano
Johannes Sixt writes: > Am 06.11.18 um 15:55 schrieb Johannes Schindelin via GitGitGadget: >> From: Johannes Schindelin >> >> When git.rc is compiled into git.res, the result is actually dependent >> on the architecture. That is, you cannot simply link a 32-bit git.res >> into a 64-bit git.exe.

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

2018-11-06 Thread brian m. carlson
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: > > "sha1", > /* "sha1",

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

2018-11-06 Thread Junio C Hamano
Ramsay Jones writes: > On 06/11/2018 14:53, Johannes Schindelin via GitGitGadget wrote: >> From: Johannes Schindelin >> >> On Windows, an absolute POSIX path needs to be turned into a Windows >> one. >> >> Signed-off-by: Johannes Schindelin >> --- >> path.c | 5 + >> 1 file changed, 5

Re: [PATCH 2/3] approxidate: handle pending number for "specials"

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 04:48:28PM -0800, Carlo Arenas wrote: > On Thu, Nov 1, 2018 at 10:24 PM Jeff King wrote: > > > > static void date_yesterday(struct tm *tm, struct tm *now, int *num) > > { > > + *num = 0; > > the only caller (date_time) for this sends num = NULL, so this >

Re: [PATCH v2] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > diff --git a/builtin/range-diff.c b/builtin/range-diff.c > index f01a0be851..05d1f6b6b6 100644 > --- a/builtin/range-diff.c > +++ b/builtin/range-diff.c > @@ -16,11 +16,14 @@ int cmd_range_diff(int argc, const char **argv, const > char *prefix) > int

Re: [PATCH 2/3] approxidate: handle pending number for "specials"

2018-11-06 Thread Carlo Arenas
On Thu, Nov 1, 2018 at 10:24 PM Jeff King wrote: > > static void date_yesterday(struct tm *tm, struct tm *now, int *num) > { > + *num = 0; the only caller (date_time) for this sends num = NULL, so this triggers a segfault. the only reference I could find to that apparently unused

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

2018-11-06 Thread Junio C Hamano
Jeff King writes: > 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. ;-) Great minds think alike, I guess. I think it is a great idea

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

2018-11-06 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > OK here is a less constroversal attempt to add new trailers. Instead > of changing the default behavior (which could be done incrementally > later), this patch simply adds a new option --append-trailer to revert > and cherry-pick. I almost agree, except that the

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

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 05:11:18PM -0500, Jeff King wrote: > On Tue, Nov 06, 2018 at 06:48:22PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > The implementation looks fine to me, but as noted in > > https://public-inbox.org/git/8736se6qyc@evledraar.gmail.com/ I > > wonder what the plausible

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

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 06:48:22PM +0100, Ævar Arnfjörð Bjarmason wrote: > The implementation looks fine to me, but as noted in > https://public-inbox.org/git/8736se6qyc@evledraar.gmail.com/ I > wonder what the plausible end-game is. That we'll turn this on by > default in a few years, and

Re: [PATCH] gitk: don't highlight submodule diff lines outside submodule diffs

2018-11-06 Thread Роман Донченко
06.11.2018 23:06, Stefan Beller пишет: On Tue, Nov 6, 2018 at 12:03 PM Роман Донченко wrote: A line that starts with " <" or " >" is not necessarily a submodule diff line. It might just be a context line in a normal diff, representing a line starting with " <" or " >" respectively. Use the

Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-06 Thread Johannes Sixt
Am 06.11.18 um 15:55 schrieb Johannes Schindelin via GitGitGadget: From: Johannes Schindelin When git.rc is compiled into git.res, the result is actually dependent on the architecture. That is, you cannot simply link a 32-bit git.res into a 64-bit git.exe. Therefore, to allow 32-bit and

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

2018-11-06 Thread Johannes Sixt
Am 06.11.18 um 15:53 schrieb Johannes Schindelin via GitGitGadget: From: Johannes Schindelin On Windows, an absolute POSIX path needs to be turned into a Windows one. If I were picky, I would say that in a pure Windows application there cannot be POSIX paths to begin with. Even if a path

Re: [PATCH v2 1/1] pack-objects: ignore ambiguous object warnings

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 12:34:47PM -0800, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > A git push process runs several processes during its run, but one > includes git send-pack which calls git pack-objects and passes > the known have/wants into stdin using object ids.

Re: [PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Derrick Stolee
On 11/6/2018 2:51 PM, Jeff King wrote: On Tue, Nov 06, 2018 at 02:44:42PM -0500, Jeff King wrote: The fix for this is simple: set core.warnAmbiguousRefs to false for this specific call of git pack-objects coming from git send-pack. We don't want to default it to false for all calls to git

Re: [PATCH] gitk: don't highlight submodule diff lines outside submodule diffs

2018-11-06 Thread Stefan Beller
On Tue, Nov 6, 2018 at 12:03 PM Роман Донченко wrote: > > A line that starts with " <" or " >" is not necessarily a submodule > diff line. It might just be a context line in a normal diff, representing > a line starting with " <" or " >" respectively. > > Use the currdiffsubmod variable to

Re: [PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Derrick Stolee
On 11/6/2018 2:44 PM, Jeff King wrote: On Tue, Nov 06, 2018 at 11:13:47AM -0800, Derrick Stolee via GitGitGadget wrote: I've been looking into the performance of git push for very large repos. Our users are reporting that 60-80% of git push time is spent during the "Enumerating objects" phase

Re: [PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 02:44:42PM -0500, Jeff King wrote: > > The fix for this is simple: set core.warnAmbiguousRefs to false for this > > specific call of git pack-objects coming from git send-pack. We don't want > > to default it to false for all calls to git pack-objects, as it is valid to >

Re: [PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 11:13:47AM -0800, Derrick Stolee via GitGitGadget wrote: > I've been looking into the performance of git push for very large repos. Our > users are reporting that 60-80% of git push time is spent during the > "Enumerating objects" phase of git pack-objects. > > A git push

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

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 02:02:42PM +, 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

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

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 7:15 PM Ramsay Jones wrote: > >> @@ -709,6 +710,10 @@ char *expand_user_path(const char *path, int > >> real_home) > >> > >> if (path == NULL) > >> goto return_null; > >> +#ifdef __MINGW32__ > >> +if (path[0] == '/') > >> +return

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

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 3:55 PM Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > On Windows, an absolute POSIX path needs to be turned into a Windows > one. > > Signed-off-by: Johannes Schindelin > --- > path.c | 5 + > 1 file changed, 5 insertions(+) > > diff

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

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Nguyễn Thái Ngọc Duy wrote: > OK here is a less constroversal attempt to add new trailers. Instead > of changing the default behavior (which could be done incrementally > later), this patch simply adds a new option --append-trailer to revert > and cherry-pick. > > Both will

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 9:57 AM Ævar Arnfjörð Bjarmason > wrote: >> Leaving aside the question of whether the pain of switching is worth it, >> I think it's a worthwihle to consider if we could stop hardcoding one >> specific human language in commit

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 6:25 PM Leif Lindholm wrote: > > > Sure. Only today was the first time I had a look at the git sources, > > > so some guidance would be most appreciated. > > > > No problem (and if you don't have time to do it, just say the word and > > I will continue; this is my bug after

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Leif Lindholm
On Tue, Nov 06, 2018 at 06:13:00PM +0100, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 5:31 PM Leif Lindholm wrote: > > > > diff --git a/builtin/log.c b/builtin/log.c > > > > index 061d4fd86..07e6ae2c1 100644 > > > > --- a/builtin/log.c > > > > +++ b/builtin/log.c > > > > @@ -1009,7 +1009,8 @@

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 5:31 PM Leif Lindholm wrote: > > > diff --git a/builtin/log.c b/builtin/log.c > > > index 061d4fd86..07e6ae2c1 100644 > > > --- a/builtin/log.c > > > +++ b/builtin/log.c > > > @@ -1009,7 +1009,8 @@ static void show_diffstat(struct rev_info *rev, > > > > > > memcpy(,

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Leif Lindholm
On Tue, Nov 06, 2018 at 04:56:11PM +0100, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 11:48 AM Leif Lindholm > wrote: > > > > Commit 43662b23abbd > > ("format-patch: keep cover-letter diffstat wrapped in 72 columns") made > > format-patch keep the diffstat to within 72 characters. However, it

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 5:18 PM Laszlo Ersek wrote: > >> + opts.stat_width = MAIL_DEFAULT_WRAP; > > > > How about a test to make sure this will not be broken in future? > > Oh, looks like I won't have to test this patch at all! ;) > > (Just kidding, I'll test the next iteration.)

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Laszlo Ersek
On 11/06/18 16:56, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 11:48 AM Leif Lindholm > wrote: >> >> Commit 43662b23abbd >> ("format-patch: keep cover-letter diffstat wrapped in 72 columns") made >> format-patch keep the diffstat to within 72 characters. However, it does >> this even when --stat

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 9:57 AM Ævar Arnfjörð Bjarmason wrote: > Leaving aside the question of whether the pain of switching is worth it, > I think it's a worthwihle to consider if we could stop hardcoding one > specific human language in commit messages, and instead leave something >

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

2018-11-06 Thread Ramsay Jones
On 06/11/2018 15:54, Ramsay Jones wrote: > > > On 06/11/2018 14:53, Johannes Schindelin via GitGitGadget wrote: >> From: Johannes Schindelin >> >> On Windows, an absolute POSIX path needs to be turned into a Windows >> one. >> >> Signed-off-by: Johannes Schindelin >> --- >> path.c | 5

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Johannes Schindelin wrote: > Hi, > > On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > >> On Mon, Nov 05 2018, Eric Sunshine wrote: >> >> > On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason >> > wrote: >> >> Add a --no-patch option which shows which changes got

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 11:48 AM Leif Lindholm wrote: > > Commit 43662b23abbd > ("format-patch: keep cover-letter diffstat wrapped in 72 columns") made > format-patch keep the diffstat to within 72 characters. However, it does > this even when --stat is explicitly set on the command line. > > Make

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

2018-11-06 Thread Ramsay Jones
On 06/11/2018 14:53, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > On Windows, an absolute POSIX path needs to be turned into a Windows > one. > > Signed-off-by: Johannes Schindelin > --- > path.c | 5 + > 1 file changed, 5 insertions(+) > > diff --git

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

2018-11-06 Thread Ramsay Jones
On 06/11/2018 02:33, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> There are a few issues with opterror() >> >> - it tries to assemble an English sentence from pieces. This is not >> great for translators because we give them pieces instead of a full >> sentence. >> >> - It's

Re: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows

2018-11-06 Thread Johannes Schindelin
List, I have no idea why this mail made it to GitGitGadget's email account but not to the Git mailing list... Sorry about that. Ciao, Johannes On Wed, 31 Oct 2018, Chris. Webster via GitGitGadget wrote: > From: "Chris. Webster" > > Use File::Spec->devnull() for output redirection to avoid

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Johannes Schindelin
Hi, On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Mon, Nov 05 2018, Eric Sunshine wrote: > > > On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason > > wrote: > >> Add a --no-patch option which shows which changes got removed, added > >> or moved etc., without showing the diff

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 04 2018, Nguyễn Thái Ngọc Duy wrote: > When a commit is reverted (or cherry-picked with -x) we add an English > sentence recording that commit id in the new commit message. Make > these real trailer lines instead so that they are more friendly to > parsers (especially "git

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Eric Sunshine wrote: > On Mon, Nov 5, 2018 at 11:17 PM Junio C Hamano wrote: >> Ævar Arnfjörð Bjarmason writes: >> > This change doesn't update git-format-patch with a --no-patch >> > option. That can be added later similar to how format-patch first >> > learned

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-05 Thread Junio C Hamano
Eric Sunshine writes: >> Calling this --[no-]patch might make it harder to integrate it to >> format-patch later, though. I suspect that people would expect >> "format-patch --no-patch ..." to omit both the patch part of the >> range-diff output *AND* the patch that should be applied to the >>

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-05 Thread Eric Sunshine
On Mon, Nov 5, 2018 at 11:17 PM Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > This change doesn't update git-format-patch with a --no-patch > > option. That can be added later similar to how format-patch first > > learned --range-diff, and then --creation-factor in > > 8631bf1cdd

Re: [PATCH v3 00/14] Reduce #ifdef NO_PTHREADS

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Changes since v2 > > - more cleanups in grep.c, read-cache.c and index-pack.c > - the send-pack.c changes are back, but this time I just add > async_with_fork() to move NO_PTHREADS back in run-command.c The patches all looked sensible; I'll wait for a few more

Re: [PATCH] doc: fix typos in release notes

2018-11-05 Thread Junio C Hamano
org...@gmail.com writes: > From: Orgad Shaneh > > Signed-off-by: Orgad Shaneh > --- > Documentation/RelNotes/2.20.0.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks. > > diff --git a/Documentation/RelNotes/2.20.0.txt > b/Documentation/RelNotes/2.20.0.txt > index

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-05 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > This change doesn't update git-format-patch with a --no-patch > option. That can be added later similar to how format-patch first > learned --range-diff, and then --creation-factor in > 8631bf1cdd ("format-patch: add --creation-factor tweak for > --range-diff",

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

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > static const char *describe_object(struct object *obj) > { > - static struct strbuf buf = STRBUF_INIT; > - char *name = name_objects ? > - lookup_decoration(fsck_walk_options.object_names, obj) : NULL; > + static struct strbuf bufs[4] = {

Re: [PATCH v2 13/16] parse-options.c: turn some die() to BUG()

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > diff --git a/parse-options.c b/parse-options.c > index 0bf817193d..3f5f985c1e 100644 > --- a/parse-options.c > +++ b/parse-options.c > @@ -197,7 +197,7 @@ static int get_value(struct parse_opt_ctx_t *p, > return 0; > > default: > -

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

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > There are a few issues with opterror() > > - it tries to assemble an English sentence from pieces. This is not > great for translators because we give them pieces instead of a full > sentence. > > - It's a wrapper around error() and needs some hack to let the

Re: [PATCH v2 09/16] remote.c: turn some error() or die() to BUG()

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The first error, "internal error", is clearly a BUG(). The second two > are meant to catch calls with invalid parameters and should never > happen outside the test suite. Sounds as if it would happen inside test suites. I guess by "inside the test suite" you

Re: [PATCH v2 08/16] reflog: mark strings for translation

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > if (argc - i < 1) > - return error("Nothing to delete?"); > + return error(_("no reflog specified to delete")); Better. Thanks.

Re: [PATCH v2 07/16] read-cache.c: add missing colon separators

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > typechange_fmt and added_fmt should have a colon before "needs > update". Align the statements to make it easier to read and see. Also > drop the unnecessary (). > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > read-cache.c | 10 +- > 1 file changed, 5

Re: [PATCH v2 05/16] read-cache.c: turn die("internal error") to BUG()

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > read-cache.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Makes sense; thanks. > > diff --git a/read-cache.c b/read-cache.c > index d57958233e..0c37f4885e 100644 > --- a/read-cache.c > +++

Re: [PATCH v2 03/16] archive.c: mark more strings for translation

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Two messages also print extra information to be more useful > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > archive.c | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/archive.c b/archive.c > index 9d16b7fadf..d8f6e1ce30 100644 >

Re: [PATCH v2 01/16] git.c: mark more strings for translation

2018-11-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > One string is slightly updated to keep consistency with the rest: > die() should with lowercase. s/should/& begin/, I think, in which case I could locally touch up. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > git.c | 30 +++--- > 1

Re: [PATCH v2 5/5] pretty: add support for separator option in %(trailers)

2018-11-05 Thread Junio C Hamano
Anders Waldenborg writes: > AFAICU strbuf_expand doesn't suffer from the worst things that printf(3) > suffers from wrt untrusted format string (i.e no printf style %n which > can write to memory, and no vaargs on stack which allows leaking random > stuff). > > The separator option is part of

Re: [PATCH v2 4/5] pretty: extract fundamental placeholders to separate function

2018-11-05 Thread Junio C Hamano
Anders Waldenborg writes: > Junio C Hamano writes: >> I do not think "fundamental" is the best name for this, but I agree >> that it would be useful to split the helpers into one that is >> "constant across commits" and the other one that is "per commit". > > Any suggestions for a better name? >

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-05 Thread Junio C Hamano
Duy Nguyen writes: > I think the intent of writing "This reverts " to encourage > writing "because ..." is good, but in practice many people just simply > not do it. And by not describing anything at all (footers don't count) > some commit hook can force people to actually write something.

Re: [PATCH 1/1] poll: use GetTickCount64() to avoid wrap-around issues

2018-11-05 Thread Johannes Schindelin
Hi Hannes, On Mon, 5 Nov 2018, Johannes Sixt wrote: > Am 05.11.18 um 00:26 schrieb Junio C Hamano: > > OK, thanks. It seems that the relative silence after this message is > > a sign that the resulting patch after squashing is what everybody is > > happey with? > > I'm not 100% happy. I'll

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-05 Thread Johannes Schindelin
Hi, On Sun, 4 Nov 2018, Duy Nguyen wrote: > On Sun, Nov 4, 2018 at 5:45 PM Phillip Wood wrote: > > > > On 04/11/2018 07:22, Nguyễn Thái Ngọc Duy wrote: > > > When a commit is reverted (or cherry-picked with -x) we add an English > > > sentence recording that commit id in the new commit message.

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-05 Thread Ævar Arnfjörð Bjarmason
On Mon, Nov 05 2018, Eric Sunshine wrote: > On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason > wrote: >> Add a --no-patch option which shows which changes got removed, added >> or moved etc., without showing the diff associated with them. > > This option existed in the very first

Re: [PATCH 1/1] poll: use GetTickCount64() to avoid wrap-around issues

2018-11-05 Thread Johannes Sixt
Am 05.11.18 um 08:01 schrieb Johannes Sixt: Am 05.11.18 um 00:26 schrieb Junio C Hamano: OK, thanks.  It seems that the relative silence after this message is a sign that the resulting patch after squashing is what everybody is happey with? I'm not 100% happy. I see the patch is already in

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-05 Thread Eric Sunshine
On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason wrote: > Add a --no-patch option which shows which changes got removed, added > or moved etc., without showing the diff associated with them. This option existed in the very first version[1] of range-diff (then called branch-diff)

Re: [PATCH v1] refresh_index: remove unnecessary calls to preload_index()

2018-11-05 Thread Duy Nguyen
On Mon, Nov 5, 2018 at 8:30 PM Ben Peart wrote: > > From: Ben Peart > > With refresh_index() learning to utilize preload_index() to speed up its > operation there is no longer any benefit to having the caller preload the > index first. Remove those unneeded calls by calling read_index() instead

Re: [PATCH 0/13] parseopt fixes from -Wunused-parameters

2018-11-05 Thread Duy Nguyen
On Mon, Nov 5, 2018 at 7:49 PM Jeff King wrote: > > On Mon, Nov 05, 2018 at 05:51:07PM +0100, Duy Nguyen wrote: > > > On Mon, Nov 5, 2018 at 7:39 AM Jeff King wrote: > > > > > > Continuing my exploration of what -Wunused-parameters can show us, here > > > are some bug-fixes related to

Re: [PATCH] parse-options: deprecate OPT_DATE

2018-11-05 Thread Jeff King
On Mon, Nov 05, 2018 at 10:34:02AM -0800, Carlo Marcelo Arenas Belón wrote: > Signed-off-by: Carlo Marcelo Arenas Belón > --- > Documentation/technical/api-parse-options.txt | 4 > 1 file changed, 4 deletions(-) > > diff --git a/Documentation/technical/api-parse-options.txt >

Re: [PATCH 0/13] parseopt fixes from -Wunused-parameters

2018-11-05 Thread Jeff King
On Mon, Nov 05, 2018 at 05:51:07PM +0100, Duy Nguyen wrote: > On Mon, Nov 5, 2018 at 7:39 AM Jeff King wrote: > > > > Continuing my exploration of what -Wunused-parameters can show us, here > > are some bug-fixes related to parse-options callbacks. > > > > This is the last of the actual

Re: [PATCH v2 5/5] pretty: add support for separator option in %(trailers)

2018-11-05 Thread Anders Waldenborg
Junio C Hamano writes: > Anders Waldenborg writes: > >> @@ -1352,6 +1353,17 @@ static size_t format_commit_one(struct strbuf *sb, /* >> in UTF-8 */ >> arg++; >> >> opts.only_trailers = 1; >> +

Re: [PATCH] diff: differentiate error handling in parse_color_moved_ws

2018-11-05 Thread Stefan Beller
On Sun, Nov 4, 2018 at 10:12 PM Junio C Hamano wrote: > > Junio C Hamano writes: > > > Stefan Beller writes: > > > >> > >> -static int parse_color_moved_ws(const char *arg) > >> +static unsigned parse_color_moved_ws(const char *arg) > >> { > >> int ret = 0; > >> struct string_list l

Re: [PATCH 12/12] fsck: mark strings for translation

2018-11-05 Thread Duy Nguyen
On Mon, Oct 29, 2018 at 12:53 PM SZEDER Gábor wrote: > The contents of 'out': > > broken link fromtree be45bbd3809e0829297cefa576e699c134abacfd > (refs/heads/master@{1112912113}:caesar.t) > toblob be45bbd3809e0829297cefa576e699c134abacfd >

Re: [PATCH 0/13] parseopt fixes from -Wunused-parameters

2018-11-05 Thread Duy Nguyen
On Mon, Nov 5, 2018 at 7:39 AM Jeff King wrote: > > Continuing my exploration of what -Wunused-parameters can show us, here > are some bug-fixes related to parse-options callbacks. > > This is the last of the actual bug-fixes I've found. After this, I have > about 60 patches worth of cleanups

Re: [PATCH] multi-pack-index: make code -Wunused-parameter clean

2018-11-05 Thread Derrick Stolee
On 11/3/2018 10:27 PM, Jeff King wrote: On Sat, Nov 03, 2018 at 05:49:57PM -0700, Carlo Marcelo Arenas Belón wrote: introduced in 662148c435 ("midx: write object offsets", 2018-07-12) but included on all previous versions as well. midx.c:713:54: warning: unused parameter 'nr_objects'

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-05 Thread Duy Nguyen
On Mon, Nov 5, 2018 at 1:56 AM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > A reverted commit will have a new trailer > > > > Revert: > > Please don't, unless you are keeping the current "the effect of > commit X relative to its parent Y was reverted" writtein in prose, >

Re: [PATCH/RFC v2] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-05 Thread Duy Nguyen
On Sun, Nov 4, 2018 at 10:30 PM brian m. carlson wrote: > However, I do have concerns about breaking compatibility with existing > scripts. I wonder if we could add a long alias for git cherry-pick -x, > say "--notate" and have "--notate=text" mean "-x" and "--notate=trailer" > mean this new

Re: [PATCH v3 7/8] push: add DWYM support for "git push refs/remotes/...:"

2018-11-05 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > After all sometimes "other" is just the repo on my laptop or server. I > shouldn't need to jump through hoops to re-push stuff from my "other" > repo anymore than from the local repo. > > Yes refs/remotes/* isn't guaranteed to be "other repo's branches" in the >

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

2018-11-05 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 04 2018, brian m. carlson wrote: > SHA-1 is weak and we need to transition to a new hash function. For > some time, we have referred to this new function as NewHash. Recently, > we decided to pick SHA-256 as NewHash. The reasons behind the choice of > SHA-256 are outlined in the

Re: [PATCH v3 7/8] push: add DWYM support for "git push refs/remotes/...:"

2018-11-05 Thread Ævar Arnfjörð Bjarmason
I'll re-roll this. Hopefully sooner than later. I'll leave out the later part of this series as it's more controversial and we can discuss that later on its own. Meanwhile just some replies to this (while I remember): > Ævar Arnfjörð Bjarmason writes: > >>> On the other hand, I do not think I

Re: [PATCH v2 2/5] pretty: allow showing specific trailers

2018-11-05 Thread Eric Sunshine
On Mon, Nov 5, 2018 at 3:26 AM Anders Waldenborg wrote: > Eric Sunshine writes: > > Should the code tolerate a trailing colon? (Genuine question; it's > > easy to do and would be more user-friendly.) > > I would make sense to allow the trailing colon, it is easy enough to > just strip that away

Re: [PATCH v2 4/5] pretty: extract fundamental placeholders to separate function

2018-11-05 Thread Anders Waldenborg
Junio C Hamano writes: > I do not think "fundamental" is the best name for this, but I agree > that it would be useful to split the helpers into one that is > "constant across commits" and the other one that is "per commit". Any suggestions for a better name? standalone? simple? invariant?

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