Re: Bug: git-describe abbrev documentation mentions wrong default

2018-08-03 Thread Ævar Arnfjörð Bjarmason
On Fri, Aug 03 2018, Martin Mosegaard Amdisen wrote: > The documentation for the "git describe --abbrev" flag says that the > default value is 7 hexadecimal digits: > https://github.com/git/git/blob/master/Documentation/git-describe.txt#L63 > and > https://git-scm.com/docs/git-describe > > I

Squash & Merge Implementation

2018-08-03 Thread Vadim Belov
Hello, I'm trying to manually implement Github's *Squash *functionality. After looking many forums like stackoverflow.com I'm still struggling with the issue. *The scenario is as follows*: - master is a protected branch (configured on github) - a service user *svc *is permitted to push to master

Bug: git-describe abbrev documentation mentions wrong default

2018-08-03 Thread Martin Mosegaard Amdisen
The documentation for the "git describe --abbrev" flag says that the default value is 7 hexadecimal digits: https://github.com/git/git/blob/master/Documentation/git-describe.txt#L63 and https://git-scm.com/docs/git-describe I have experienced that sometimes I see 7 digits, but other times more.

Re: [RFC PATCH v2 06/12] submodule--helper: add a '--stage' option to the 'config' sub command

2018-08-03 Thread Antonio Ospite
On Thu, 02 Aug 2018 11:57:14 -0700 Junio C Hamano wrote: > Antonio Ospite writes: > > > Add a --stage option to the 'submodule--helper config' command so that > > the .gitmodules file can be staged without referring to it explicitly by > > its file path. > > Sorry, but I have no clue what the

Re: [PATCH 6/6] parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP

2018-08-03 Thread Kerry, Richard
s/angular brackets/angle brackets/ I've never seen these called "angular brackets". Maybe a non-native English speaker issue. Regards, Richard. PS. Please excuse my sending this twice, I don't seem to have default settings that are compatible with the list. Richard Kerry BNCS

Re: [RFC PATCH v2 04/12] submodule--helper: add a new 'config' subcommand

2018-08-03 Thread Antonio Ospite
On Thu, 2 Aug 2018 15:20:33 -0400 Jeff King wrote: > On Thu, Aug 02, 2018 at 11:47:30AM -0700, Stefan Beller wrote: > > > > +static int module_config(int argc, const char **argv, const char *prefix) > > > +{ > > > + if (argc < 2 || argc > 3) > > > + die("submodule--helper

Re: [PATCH v3 2/2] sequencer: fix quoting in write_author_script

2018-08-03 Thread Eric Sunshine
On Fri, Aug 3, 2018 at 5:33 AM Phillip Wood wrote: > If there isn't some backward compatibility then if git gets upgraded > while rebase is stopped then the author data will be silently corrupted > if it contains "'". read_author_ident() will error out but that is only > used for the root commit.

Re: [RFC PATCH v5 0/4] add -p: select individual hunk lines

2018-08-03 Thread Phillip Wood
Hi Ævar Thanks for looking at this. On 28/07/18 13:40, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Jul 26 2018, Phillip Wood wrote: > >> Unfortuantely v4 had test failures due to a suprious brace from a last >> minute edit to a comment that I forgot to test. This version fixes >> that, my

Re: [PATCH v7 21/22] gc: automatically write commit-graph files

2018-08-03 Thread SZEDER Gábor
Hi Derrick, > The commit-graph file is a very helpful feature for speeding up git > operations. In order to make it more useful, make it possible to > write the commit-graph file during standard garbage collection > operations. > > Add a 'gc.commitGraph' config setting that triggers writing a

Re: [PATCH v3 2/2] sequencer: fix quoting in write_author_script

2018-08-03 Thread Phillip Wood
Dear Eric and Junio On 03/08/18 08:59, Eric Sunshine wrote: > On Thu, Aug 2, 2018 at 1:27 PM Junio C Hamano wrote: >> Phillip Wood writes: >>> For other interactive rebases this only affects external scripts that >>> read the author script and users whose git is upgraded from the shell >>>

Re: [RFC PATCH v2 12/12] submodule: remove the .gitmodules file when it is empty

2018-08-03 Thread Antonio Ospite
On Thu, 2 Aug 2018 14:15:54 -0700 Stefan Beller wrote: > On Thu, Aug 2, 2018 at 6:47 AM Antonio Ospite wrote: > > > > In particular this makes it possible to really clean things up when > > removing the last submodule with "git rm". > > This sentence is a continuation of the subject line, and

Re: [RFC PATCH v2 11/12] dir: move is_empty_file() from builtin/am.c to dir.c and make it public

2018-08-03 Thread Antonio Ospite
On Thu, 2 Aug 2018 13:50:55 -0700 Stefan Beller wrote: > On Thu, Aug 2, 2018 at 6:47 AM Antonio Ospite wrote: > > > > The is_empty_file() function can be generally useful, move it to dir.c > > and make it public. > > > > Signed-off-by: Antonio Ospite > > Makes sense, > > Thanks, > Stefan >

Re: [PATCH 6/6] parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP

2018-08-03 Thread Kerry, Richard
s/angular brackets/angle brackets/ I've never seen these called "angular brackets". Richard Kerry BNCS Engineer, SI SOL Telco & Media Vertical Practice M: +44 (0)7812 325518 2nd Floor, MidCity Place, 71 High Holborn, London, WC1V 6EA

Re: [PATCH v3 2/2] sequencer: fix quoting in write_author_script

2018-08-03 Thread Eric Sunshine
On Thu, Aug 2, 2018 at 1:27 PM Junio C Hamano wrote: > Phillip Wood writes: > > For other interactive rebases this only affects external scripts that > > read the author script and users whose git is upgraded from the shell > > version of rebase -i while rebase was stopped when the author

Re: [PATCH v2 2/2] doc hash-function-transition: pick SHA-256 as NewHash

2018-08-03 Thread Jonathan Nieder
Hi again, Sorry for the slow review. I finally got a chance to look this over again. My main nits are about the commit message: I think it still focuses too much on the process instead of the usual "knowing what I know now, here's the clearest explanation for why we need this patch" approach. I

Re: [PATCH v3 1/2] sequencer: handle errors in read_author_ident()

2018-08-03 Thread Eric Sunshine
On Thu, Aug 2, 2018 at 7:20 AM Phillip Wood wrote: > The calling code did not treat NULL as an error. Instead NULL caused > it to fallback to using the default author when creating the new > commit. This changed the date and potentially the author of the > commit which corrupted the author data

[no subject]

2018-08-03 Thread Mr Richard
-- I Mr Richard Wahl donates $ 2 Million Dollars from part of my $533M In Mega MillionsJackpot.WATCH ME HERE: https://www.youtube.com/watch?v=tne02ExNDrw File for claims

Re: [PATCH] color: protect against out-of-bounds array access/assignment

2018-08-03 Thread Eric Sunshine
On Fri, Aug 3, 2018 at 2:26 AM Jonathan Nieder wrote: > Eric Sunshine wrote: > > + if (fd < 0 || fd >= ARRAY_SIZE(want_auto)) > > + BUG("file descriptor out of range: %d", fd); > > The indentation looks wrong here. Yep, that's weird. I can't figure out how that got indented with four

Re: [PoC] coccinelle: make Coccinelle-related make targets more fine-grained

2018-08-03 Thread Julia Lawall
By the way, you can see my performance numbers here: https://www.usenix.org/system/files/conference/atc18/atc18-lawall.pdf Page 8, figures 4 and 5. julia

Re: [PoC] coccinelle: make Coccinelle-related make targets more fine-grained

2018-08-03 Thread Jonathan Nieder
Hi, Jeff King wrote: > On Thu, Aug 02, 2018 at 02:01:55PM -0400, Jeff King wrote: >> I suspect if we go with the one-spatch-per-source route, though, that we >> could do this just with regular make rules. > > Yeah, it's pretty straightforward: > > diff --git a/Makefile b/Makefile > index

Re: [PATCH] color: protect against out-of-bounds array access/assignment

2018-08-03 Thread Jonathan Nieder
Hi, Eric Sunshine wrote: > want_color_fd() is designed to work only with standard input, output, > and error file descriptors, and stores information about each descriptor > in an array. However, it doesn't verify that the passed-in descriptor > lives within that set, which, with a buggy caller,

<    1   2