Tip of 'next' has been rewound post 2.17

2018-04-10 Thread Junio C Hamano
I'll follow up with the full copy of "What's cooking" report later, but here is a quick heads-up to warn those who have been building their private editions on top of 'next' that the tip of 'next' has been rebuilt, while kicking a few topics back to 'pu'. Thanks.

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

2018-04-10 Thread Sergey Organov
Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Tue, 10 Apr 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> >> > Once upon a time, I dreamt of an interactive rebase that would not >> > flatten branch

Re: Is support for 10.8 dropped?

2018-04-10 Thread Igor Korot
Hi, Eric, Sorry for the long delay. On Sun, Apr 8, 2018 at 7:59 PM, Eric Sunshine wrote: > On Sun, Apr 8, 2018 at 7:55 PM, Igor Korot wrote: >> On Sun, Apr 8, 2018, 6:23 PM Eric Sunshine wrote: >>> And, as noted earlier,

Re: [PATCH v8 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Taylor Blau
On Wed, Apr 11, 2018 at 12:11:47PM +0900, Junio C Hamano wrote: > Taylor Blau writes: > > >> > +#define OPT_CALLBACK_VALUE(s, l, h, f, i) \ > >> > +{ OPTION_CALLBACK, (s), (l), NULL, NULL, (h), PARSE_OPT_NOARG | > >> > \ > >> > +PARSE_OPT_NONEG, (f), (i) } > >>

Re: [PATCH v8 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Junio C Hamano
Taylor Blau writes: >> > +#define OPT_CALLBACK_VALUE(s, l, h, f, i) \ >> > + { OPTION_CALLBACK, (s), (l), NULL, NULL, (h), PARSE_OPT_NOARG | \ >> > + PARSE_OPT_NONEG, (f), (i) } >> > + >> > +static struct option builtin_config_options[]; >> >> OK. I am not sure if

Re: [PATCH v2 06/10] commit.c: use generation to halt paint walk

2018-04-10 Thread Junio C Hamano
Derrick Stolee writes: > @@ -800,17 +810,26 @@ static struct commit_list *paint_down_to_common(struct > commit *one, int n, struc > return result; > } > prio_queue_put(, one); > + if (one->generation < min_nonstale_gen) > +

Re: [PATCH v2 04/10] commit-graph: compute generation numbers

2018-04-10 Thread Junio C Hamano
Derrick Stolee writes: > + if ((*list)->generation != GENERATION_NUMBER_INFINITY) { > + if ((*list)->generation > GENERATION_NUMBER_MAX) > + die("generation number %u is too large to store > in commit-graph", > +

Re: [PATCH v2 03/10] commit: add generation number to struct commmit

2018-04-10 Thread Junio C Hamano
Derrick Stolee writes: > The generation number of a commit is defined recursively as follows: > > * If a commit A has no parents, then the generation number of A is one. > * If a commit A has parents, then the generation number of A is one > more than the maximum

Re: [PATCH v2 02/10] merge: check config before loading commits

2018-04-10 Thread Junio C Hamano
Derrick Stolee writes: > diff --git a/builtin/merge.c b/builtin/merge.c > index ee050a47f3..20897f8223 100644 > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -1183,13 +1183,14 @@ int cmd_merge(int argc, const char **argv, const char > *prefix) > branch =

Re: git-lfs question

2018-04-10 Thread Taylor Blau
On Wed, Apr 11, 2018 at 01:16:42AM +, John Sullivan wrote: > Hello - I've seen instructions that say after installing git to also install > git-lfs. > > But today when installing git I noticed that in the install options > there was a default selected options stating "Git LFS (Large File >

Re: [PATCH v8 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Taylor Blau
On Wed, Apr 11, 2018 at 10:24:45AM +0900, Junio C Hamano wrote: > Taylor Blau writes: > > > Attached is the eighth re-roll of my series to add `--type=` as > > the preferred alternative for `--`. > > > > The main changes since v7 concern handling degenerate cases, such as: > >

Re: [PATCH v8 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Junio C Hamano
Taylor Blau writes: > Attached is the eighth re-roll of my series to add `--type=` as > the preferred alternative for `--`. > > The main changes since v7 concern handling degenerate cases, such as: > > * git config --type=int --type=bool > * git config --type=int --int > >

git-lfs question

2018-04-10 Thread John Sullivan
Hello - I've seen instructions that say after installing git to also install git-lfs. But today when installing git I noticed that in the install options there was a default selected options stating "Git LFS (Large File Support)". Does this mean git is automatically adding git-LFS or just

[PATCH v8 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Taylor Blau
Hi, Attached is the eighth re-roll of my series to add `--type=` as the preferred alternative for `--`. The main changes since v7 concern handling degenerate cases, such as: * git config --type=int --type=bool * git config --type=int --int We have previously had discussion about whether we

[PATCH v8 1/2] builtin/config.c: treat type specifiers singularly

2018-04-10 Thread Taylor Blau
Internally, we represent `git config`'s type specifiers as a bitset using OPT_BIT. 'bool' is 1<<0, 'int' is 1<<1, and so on. This technique allows for the representation of multiple type specifiers in the `int types` field, but this multi-representation is left unused. In fact, `git config` will

[PATCH v8 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

2018-04-10 Thread Taylor Blau
`git config` has long allowed the ability for callers to provide a 'type specifier', which instructs `git config` to (1) ensure that incoming values can be interpreted as that type, and (2) that outgoing values are canonicalized under that type. In another series, we propose to extend this

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Isn't everyone involved much better solved if we come up with some plan > to split these off from git.git? I.e. I think if if git-gui, gitk and > gitweb were proposed for inclusion in-tree today I don't think we'd > bite, and instead point to

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 10 2018, Junio C. Hamano wrote: > Chris Maes writes: > >> Is there any hope from here that anyone will pick up this / these >> changes? Will anyone else be assigned the main responsible for this >> git-gui repository? >> >> Just hoping to revive the discussion

Re: git remote rename problem with trailing \\ for remote.url config entries (on Windows)

2018-04-10 Thread Junio C Hamano
Johannes Schindelin writes: > A quick test with my `empty-config-section` patch series shows that it > addresses this issue. A quick bisec confirms that the patch with the > online "git_config_set: make use of the config parser's event stream" is > responsible for

Re: git remote rename problem with trailing \\ for remote.url config entries (on Windows)

2018-04-10 Thread Johannes Schindelin
Hi, [I know, blast from the past...] On Mon, 13 Feb 2017, Junio C Hamano wrote: > Marc Strapetz writes: > > > One of our users has just reported that: > > > > $ git remote rename origin origin2 > > > > will turn following remote entry: > > > > [remote "origin"] > >

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Junio C Hamano
Chris Maes writes: > Is there any hope from here that anyone will pick up this / these > changes? Will anyone else be assigned the main responsible for this > git-gui repository? > > Just hoping to revive the discussion here, since the > https://github.com/patthoyts/git-gui/

Re: [PATCH 0/6] Rename files to use dashes instead of underscores

2018-04-10 Thread Stefan Beller
Hi Johannes, On Tue, Apr 10, 2018 at 3:39 PM, Johannes Schindelin wrote: > Hi Stefan, > > On Tue, 10 Apr 2018, Stefan Beller wrote: > >> This is the followup for >> https://public-inbox.org/git/xmqqbmer4vfh@gitster-ct.c.googlers.com/ >> >> We have no files left

Re: git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Johannes Schindelin
Hi Junio, On Wed, 11 Apr 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Mon, 9 Apr 2018, Junio C Hamano wrote: > > > >> * bb/git-gui-ssh-key-files (2018-03-02) 2 commits > >> * bp/git-gui-bind-kp-enter (2018-03-02) 2 commits > >> *

Re: [PATCH 0/6] Rename files to use dashes instead of underscores

2018-04-10 Thread Johannes Schindelin
Hi Stefan, On Tue, 10 Apr 2018, Stefan Beller wrote: > This is the followup for > https://public-inbox.org/git/xmqqbmer4vfh@gitster-ct.c.googlers.com/ > > We have no files left with underscores in their names. Yaaay! > Stefan Beller (6): > write_or_die.c: rename to use dashes in file

Re: [PATCH 6/8] gpg-interface: find the last gpg signature line

2018-04-10 Thread Junio C Hamano
Junio C Hamano writes: >> That test was fixed a week ago: >> https://github.com/git/git/commit/a99d903f21d102a5768f19157085a9733aeb68dd > > Well, you cannot expect any reviewer to know about a change that has > never been sent to the list and has never been part of even 'pu' >

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

2018-04-10 Thread Johannes Schindelin
Hi Sergey, On Tue, 10 Apr 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > Once upon a time, I dreamt of an interactive rebase that would not > > flatten branch structure, but instead recreate the commit topology > > faithfully. > > [...] > > >

Re: [PATCH v1 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 23:04, Ben Peart wrote: > The File System Excludes module is a new programmatic way to exclude files and > folders from git's traversal of the working directory. fsexcludes_init() > should > be called with a string buffer that contains a NUL

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Johannes Schindelin
Hi Chris, On Tue, 10 Apr 2018, Chris Maes wrote: > using git 2.16 the same problem is still present. And probably 2.17, too. > I see that the pull request https://github.com/patthoyts/git-gui/pull/12 > (along with 15 other pull requests) are lying around since about one > year without any sign

Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

2018-04-10 Thread Johannes Schindelin
Hi Martin, On Tue, 10 Apr 2018, Martin Ågren wrote: > On 10 April 2018 at 14:30, Johannes Schindelin > wrote: > > The --rebase-merges mode is probably not half as intuitive to use as > > its inventor hopes, so let's document it some. > > I quite like this

Re: git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Stefan Beller
On Tue, Apr 10, 2018 at 2:38 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> On Mon, 9 Apr 2018, Junio C Hamano wrote: >> >>> * bb/git-gui-ssh-key-files (2018-03-02) 2 commits This looks good to me. Please merge down. >>> *

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Junio C Hamano
Derrick Stolee writes: > On 4/9/2018 6:08 PM, Junio C Hamano wrote: >> >> I guess we'd want a final cleaned-up round after all ;-) Thanks. > > v8 sent [1]. Thanks. Thanks, will take a look and queue.

Re: [PATCH v2 1/1] perl: fix installing modules from contrib

2018-04-10 Thread Junio C Hamano
Christian Hesse writes: > Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) > removed a target that allowed Makefiles from contrib/ to get the correct > install path. This introduces a new target for main Makefile and fixes > installation for Mediawiki

Re: git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Junio C Hamano
Johannes Schindelin writes: > On Mon, 9 Apr 2018, Junio C Hamano wrote: > >> * bb/git-gui-ssh-key-files (2018-03-02) 2 commits >> * bp/git-gui-bind-kp-enter (2018-03-02) 2 commits >> * cb/git-gui-ttk-style (2018-03-05) 2 commits > > What is your plan with those? I

Re: [PATCH 0/6] Rename files to use dashes instead of underscores

2018-04-10 Thread Stefan Beller
On Tue, Apr 10, 2018 at 2:26 PM, Stefan Beller wrote: > This is the followup for > https://public-inbox.org/git/xmqqbmer4vfh@gitster-ct.c.googlers.com/ > > We have no files left with underscores in their names. > It applies on master, and also contains that patch for

[PATCH 1/6] write_or_die.c: rename to use dashes in file name

2018-04-10 Thread Stefan Beller
This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Signed-off-by: Stefan Beller --- Makefile | 2 +- write_or_die.c => write-or-die.c | 0 2 files changed, 1

[PATCH 4/6] sha1_name.c: rename to use dash in file name

2018-04-10 Thread Stefan Beller
This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Signed-off-by: Stefan Beller --- Makefile | 2 +- list-objects-filter.c | 2 +- object.h |

[PATCH 5/6] sha1_file.c: rename to use dash in file name

2018-04-10 Thread Stefan Beller
This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Signed-off-by: Stefan Beller --- Documentation/technical/api-object-access.txt | 2 +- Makefile

[PATCH 6/6] replace_object.c: rename to use dash in file name

2018-04-10 Thread Stefan Beller
This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Noticed while adding a header corresponding to this file. Signed-off-by: Jonathan Nieder Signed-off-by: Stefan Beller

[PATCH 3/6] exec_cmd: rename to use dash in file name

2018-04-10 Thread Stefan Beller
This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Signed-off-by: Stefan Beller --- Makefile | 6 +++--- attr.c | 2 +- builtin/add.c| 2

[PATCH 0/6] Rename files to use dashes instead of underscores

2018-04-10 Thread Stefan Beller
This is the followup for https://public-inbox.org/git/xmqqbmer4vfh@gitster-ct.c.googlers.com/ We have no files left with underscores in their names. Thanks, Stefan Stefan Beller (6): write_or_die.c: rename to use dashes in file name unicode_width.h: rename to use dash in file name

[PATCH 2/6] unicode_width.h: rename to use dash in file name

2018-04-10 Thread Stefan Beller
This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Also adjust contrib/update-unicode as well. Signed-off-by: Stefan Beller --- contrib/update-unicode/README| 6 +++---

Re: [PATCH 6/6] doc: add note about shell quoting to revision.txt

2018-04-10 Thread Junio C Hamano
Andreas Heiduk writes: > Signed-off-by: Andreas Heiduk > --- > Documentation/revisions.txt | 6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt > index dfcc49c72c..c1d3a40a90 100644 >

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Junio C Hamano
Martin Ågren writes: > Your reading seems correct, so I was wrong in my speculation. My guess > is such a patch would be welcome. I checked a couple of man-pages and > this one seems particularly heavy on 'git foo' as opposed to `git foo`. > I think that's a reason to fix

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Junio C Hamano
Andreas Heiduk writes: > > -'git diff' --no-index [--options] [--] [...]:: > +'git diff' [--options] [--no-index] [--] :: > > This form is to compare the given two paths on the > filesystem. You can omit the `--no-index` option when It definitely is a good

[PATCH v1 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

2018-04-10 Thread Ben Peart
The File System Excludes module is a new programmatic way to exclude files and folders from git's traversal of the working directory. fsexcludes_init() should be called with a string buffer that contains a NUL separated list of path names of the files and/or directories that should be included.

Re: [PATCH 6/8] gpg-interface: find the last gpg signature line

2018-04-10 Thread Junio C Hamano
Ben Toews writes: >> H, what vintage of our codebase is this patch based on? Did I >> miss a patch that removes these lines >> >> >> printf ' ' >sigblanknonlfile >> get_tag_header blanknonlfile-signed-tag $commit commit $time >expect >> echo

[PATCH v1 0/2] fsexcludes: Add programmatic way to exclude files

2018-04-10 Thread Ben Peart
In git repos with large working directories an external file system monitor (like fsmonitor or gvfs) can track what files in the working directory have been modified. This information can be used to speed up git operations that scale based on the size of the working directory so that they become

[PATCH v1 2/2] fsmonitor: switch to use new fsexcludes logic and remove unused untracked cache based logic

2018-04-10 Thread Ben Peart
Update fsmonitor to utilize the new fsexcludes based logic for excluding paths that do not need to be scaned for new or modified files. Remove the old logic in dir.c that utilized the untracked cache (if enabled) to accomplish the same goal. Signed-off-by: Ben Peart ---

git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Johannes Schindelin
Hi Junio, On Mon, 9 Apr 2018, Junio C Hamano wrote: > * bb/git-gui-ssh-key-files (2018-03-02) 2 commits > - Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files > - git-gui: search for all current SSH key types > > "git gui" learned that "~/.ssh/id_ecdsa.pub" and >

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 22:04, Andreas Heiduk wrote: > Am 10.04.2018 um 21:13 schrieb Martin Ågren: >> On 10 April 2018 at 20:32, Andreas Heiduk wrote: >> Hmm, I wonder if that is actually intentional. `git commit --amend` >> could be run exactly like that and

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Ramsay Jones
On 10/04/18 21:22, Ramsay Jones wrote: > > > On 10/04/18 20:35, Derrick Stolee wrote: >> On 4/10/2018 3:21 PM, Ramsay Jones wrote: >>> >>> On 10/04/18 13:57, Derrick Stolee wrote: On 4/9/2018 6:08 PM, Junio C Hamano wrote: > I guess we'd want a final cleaned-up round after all ;-) 

Inbox SMTP, Inbox Webmail, I Sell Sure Spamming Toolz

2018-04-10 Thread Mr Spamming
I Sell Sure Spamming Toolz What we have on Stock Daily Inbox Webmail Inbox SMTP Fresh USA email leads Fresh Canada email leads Fresh Loan email leads Fresh Business emails leads Real Eastate email leads Conference delegates email leads Fresh Job Seaker emails cPanel HTTP and HTTPs Shell

[PATCH v2 1/1] completion: load completion file for external subcommand

2018-04-10 Thread Florian Gamböck
Adding external subcommands to Git is as easy as to put an executable file git-foo into PATH. Packaging such subcommands for a Linux distribution can be achieved by unpacking the executable into /usr/bin of the user's system. Adding system-wide completion scripts for new subcommands, however, can

[PATCH v2 0/1] completion: dynamic completion loading

2018-04-10 Thread Florian Gamböck
In this small patch I want to introduce a way to dynamically load completion scripts for external subcommands. A few years ago, you would put a completion script (which defines a Bash function _git_foo for a custom git subcommand foo) into /etc/bash_completion.d, or save it somewhere in your

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Ramsay Jones
On 10/04/18 20:35, Derrick Stolee wrote: > On 4/10/2018 3:21 PM, Ramsay Jones wrote: >> >> On 10/04/18 13:57, Derrick Stolee wrote: >>> On 4/9/2018 6:08 PM, Junio C Hamano wrote: I guess we'd want a final cleaned-up round after all ;-)  Thanks. >>> v8 sent [1]. Thanks. >> I just tried to

Re: [PATCH v1] fsmonitor: fix incorrect buffer size when printing version number

2018-04-10 Thread Eric Sunshine
On Tue, Apr 10, 2018 at 2:43 PM, Ben Peart wrote: > This is a trivial bug fix for passing the incorrect size to snprintf() when > outputing the version. It should be passing the size of the destination > buffer s/outputing/outputting/ > rather than the size of the

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Andreas Heiduk
Am 10.04.2018 um 21:13 schrieb Martin Ågren: > On 10 April 2018 at 20:32, Andreas Heiduk wrote: >> The section 'post-rewrite' in 'githooks.txt' renders only one command >> using backticks (`git commit`) but the other commands using single quotes >> ('git-rebase'). Align this

Re: [PATCH 4/6] doc: added '-d' and '-q' for 'git push'

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 21:38, Andreas Heiduk wrote: > Can I add "Reviewed-by: $YOU" to this one and 2/6? Sure!

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Derrick Stolee
On 4/10/2018 3:21 PM, Ramsay Jones wrote: On 10/04/18 13:57, Derrick Stolee wrote: On 4/9/2018 6:08 PM, Junio C Hamano wrote: I guess we'd want a final cleaned-up round after all ;-)  Thanks. v8 sent [1]. Thanks. I just tried to 'git am' this series and I could not get it to apply cleanly

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Andreas Heiduk
Am 10.04.2018 um 21:14 schrieb Martin Ågren: > On 10 April 2018 at 20:32, Andreas Heiduk wrote: >> Comparing > > That first line should probably not be there. The diff LGTM. > > Martin > ACK, Thanks

Re: Great Investment Offer

2018-04-10 Thread Gagum Melvin Sikze Kakha
Hello In my search for a business partner i got your contact in google search. My client is willing to invest $10 Million to $500 million but my client said he need a trusted partner who he can have a meeting at the point of releasing his funds. I told my client that you have a good profile

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Ramsay Jones
On 10/04/18 13:57, Derrick Stolee wrote: > On 4/9/2018 6:08 PM, Junio C Hamano wrote: >> >> I guess we'd want a final cleaned-up round after all ;-)  Thanks. > > v8 sent [1]. Thanks. I just tried to 'git am' this series and I could not get it to apply cleanly to current 'master', 'next' or

Re: [PATCH v8 03/14] commit-graph: add format document

2018-04-10 Thread Derrick Stolee
On 4/10/2018 3:10 PM, Stefan Beller wrote: Hi Derrick, On Tue, Apr 10, 2018 at 5:55 AM, Derrick Stolee wrote: + OID Fanout (ID: {'O', 'I', 'D', 'F'}) (256 * 4 bytes) + The ith entry, F[i], stores the number of OIDs with first + byte at most i. Thus F[255] stores

Re: [PATCH 4/6] doc: added '-d' and '-q' for 'git push'

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 20:32, Andreas Heiduk wrote: > Add the missing `-o` shortcut for `--push-option` to the synposis. > Add the missing `-d` shortcut for `--delete` in the main section. s/synposis/synopsis/ The subject of this patch says -q, which should be -o. The subject

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 20:32, Andreas Heiduk wrote: > Comparing > The two '' parameters are not optional but the option > '--no-index' is. Also move the `--options` part to the same > place where the other variants show them. That first line should probably not be there. The

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 20:32, Andreas Heiduk wrote: > The section 'post-rewrite' in 'githooks.txt' renders only one command > using backticks (`git commit`) but the other commands using single quotes > ('git-rebase'). Align this formatting to use single quotes. > > Signed-off-by:

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Stefan Beller
On Tue, Apr 10, 2018 at 5:57 AM, Derrick Stolee wrote: > On 4/9/2018 6:08 PM, Junio C Hamano wrote: >> >> >> I guess we'd want a final cleaned-up round after all ;-) Thanks. > > > v8 sent [1]. Thanks. > > -Stolee I gave the series another read and think it is ready. Stefan

Re: [PATCH v8 03/14] commit-graph: add format document

2018-04-10 Thread Stefan Beller
Hi Derrick, On Tue, Apr 10, 2018 at 5:55 AM, Derrick Stolee wrote: > + OID Fanout (ID: {'O', 'I', 'D', 'F'}) (256 * 4 bytes) > + The ith entry, F[i], stores the number of OIDs with first > + byte at most i. Thus F[255] stores the total > + number of commits

Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 14:30, Johannes Schindelin wrote: > The --rebase-merges mode is probably not half as intuitive to use as > its inventor hopes, so let's document it some. I quite like this documentation. Well-structured and well-paced. Already after the first

[PATCH v1] fsmonitor: fix incorrect buffer size when printing version number

2018-04-10 Thread Ben Peart
This is a trivial bug fix for passing the incorrect size to snprintf() when outputing the version. It should be passing the size of the destination buffer rather than the size of the value being printed. Signed-off-by: Ben Peart --- Notes: Base Ref: v2.17.0

[PATCH 6/6] doc: add note about shell quoting to revision.txt

2018-04-10 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk --- Documentation/revisions.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index dfcc49c72c..c1d3a40a90 100644 --- a/Documentation/revisions.txt +++

[PATCH 5/6] git-svn: commit-diff does not support --add-author-from

2018-04-10 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 636e09048e..11aefadf7a 100644 --- a/Documentation/git-svn.txt +++

Re: [PATCH 12/16] refs: store the main ref store inside the repository struct

2018-04-10 Thread Stefan Beller
Hi Michael, On Tue, Apr 10, 2018 at 7:02 AM, Michael Haggerty wrote: > This also makes sense to me, as far as it goes. I have a few comments > and questions: > > Why do you call the new member `main_ref_store`? Is there expected to be > some other `ref_store` associated

[PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Andreas Heiduk
The section 'post-rewrite' in 'githooks.txt' renders only one command using backticks (`git commit`) but the other commands using single quotes ('git-rebase'). Align this formatting to use single quotes. Signed-off-by: Andreas Heiduk --- Documentation/githooks.txt | 4 ++--

[PATCH 3/6] doc: clarify ignore rules for git ls-files

2018-04-10 Thread Andreas Heiduk
Explain that `git ls-files --ignored` requires at least one of the `--exclude*` options to do its job. Signed-off-by: Andreas Heiduk --- Documentation/git-ls-files.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-ls-files.txt

[PATCH 4/6] doc: added '-d' and '-q' for 'git push'

2018-04-10 Thread Andreas Heiduk
Add the missing `-o` shortcut for `--push-option` to the synposis. Add the missing `-d` shortcut for `--delete` in the main section. Signed-off-by: Andreas Heiduk --- Documentation/git-push.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[PATCH 0/6] Some doc-fixes

2018-04-10 Thread Andreas Heiduk
I'm flushing a queue of small fixes to the docs. Handling these indiviually is just to much hassle - at least I hope so :-) Andreas Heiduk (6): doc: fix formatting inconsistency in githooks.txt doc: align 'diff --no-index' in text with synopsis doc: clarify ignore rules for git ls-files

Re: [PATCH 07/16] refs: add repository argument to get_main_ref_store

2018-04-10 Thread Stefan Beller
Hi Michael, On Tue, Apr 10, 2018 at 6:36 AM, Michael Haggerty wrote: > On 04/10/2018 12:45 AM, Stefan Beller wrote: >> Add a repository argument to allow the get_main_ref_store caller >> to be more specific about which repository to handle. This is a small >> mechanical

[PATCH v1] fsmonitor: force index write after full scan

2018-04-10 Thread Ben Peart
fsmonitor currently only flags the index as dirty if the extension is being added or removed. This is a performance optimization that recognizes you can stat() a lot of files in less time than it takes to write out an updated index. This patch makes a small enhancement and flags the index dirty

Re: [PATCH 02/16] replace_object.c: rename to use dash in file name

2018-04-10 Thread Stefan Beller
Hi Junio, On Mon, Apr 9, 2018 at 8:00 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> This is more consistent with the project style. The majority of >> Git's source files use dashes in preference to underscores in their file >> names. >> >> Noticed

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

2018-04-10 Thread Ben Toews
On Tue, Apr 10, 2018 at 3:35 AM, Junio C Hamano wrote: > Ben Toews writes: > >> From: Ben Toews >> >> Currently you can only sign commits and tags using "gpg". >> ... >> have asked before on the list about using OpenBSD signify). >>

[PATCH v8 5/5] mingw/msvc: use the new-style RUNTIME_PREFIX helper

2018-04-10 Thread Dan Jacques
From: Johannes Schindelin This change also allows us to stop overriding argv[0] with the absolute path of the executable, allowing us to preserve e.g. the case of the executable's file name. This fixes https://github.com/git-for-windows/git/issues/1496 partially.

[PATCH v8 1/5] Makefile: generate Perl header from template file

2018-04-10 Thread Dan Jacques
Currently, the generated Perl script headers are emitted by commands in the Makefile. This mechanism restricts options to introduce alternative header content, needed by Perl runtime prefix support, and obscures the origin of the Perl script header. Change the Makefile to generate a header by

[PATCH v8 3/5] exec_cmd: RUNTIME_PREFIX on some POSIX systems

2018-04-10 Thread Dan Jacques
Enable Git to resolve its own binary location using a variety of OS-specific and generic methods, including: - procfs via "/proc/self/exe" (Linux) - _NSGetExecutablePath (Darwin) - KERN_PROC_PATHNAME sysctl on BSDs. - argv0, if absolute (all, including Windows). This is used to enable

[PATCH v8 4/5] exec_cmd: provide a new-style RUNTIME_PREFIX helper for Windows

2018-04-10 Thread Dan Jacques
From: Johannes Schindelin The RUNTIME_PREFIX feature comes from Git for Windows, but it was enhanced to allow support for other platforms. While changing the original idea, the concept was also improved by not forcing argv[0] to be adjusted. Let's allow the same for

[PATCH v8 2/5] Makefile: add Perl runtime prefix support

2018-04-10 Thread Dan Jacques
Broaden the RUNTIME_PREFIX flag to configure Git's Perl scripts to locate the Git installation's Perl support libraries by resolving against the script's path, rather than hard-coding that path at build-time. Hard-coding at build time worked on previous RUNTIME_PREFIX configurations (i.e.,

[PATCH v8 0/5] RUNTIME_PREFIX relocatable Git

2018-04-10 Thread Dan Jacques
This is a minor update based on comments from the v6 series. I'm hoping this set is good to go! This patch set expands support for the RUNTIME_PREFIX configuration flag, currently only used on Windows builds, to include Linux, Darwin, and FreeBSD. When Git is built with RUNTIME_PREFIX enabled, it

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Chris Maes
Hello, using git 2.16 the same problem is still present. I see that the pull request https://github.com/patthoyts/git-gui/pull/12 (along with 15 other pull requests) are lying around since about one year without any sign of life from patthoyts. Is there any hope from here that anyone will

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

2018-04-10 Thread Ben Toews
On Tue, Apr 10, 2018 at 2:24 AM, Eric Sunshine wrote: > On Mon, Apr 9, 2018 at 4:41 PM, Ben Toews wrote: >> [...] >> This patch introduces a set of configuration options for >> defining a "signing tool", of which gpg may be just one. >> With this

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

2018-04-10 Thread Sergey Organov
Hi Johannes, Johannes Schindelin writes: > Once upon a time, I dreamt of an interactive rebase that would not > flatten branch structure, but instead recreate the commit topology > faithfully. [...] > Think of --rebase-merges as "--preserve-merges done right".

Re: [PATCH 6/8] gpg-interface: find the last gpg signature line

2018-04-10 Thread Ben Toews
On Tue, Apr 10, 2018 at 3:44 AM, Junio C Hamano wrote: > Ben Toews writes: > >> diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh >> index ee093b393d..e3f1e014aa 100755 >> --- a/t/t7004-tag.sh >> +++ b/t/t7004-tag.sh >> @@ -1059,6 +1059,17 @@

Re: core.fsmonitor always perform rescans

2018-04-10 Thread Ben Peart
On 3/26/2018 12:41 AM, Tatsuyuki Ishi wrote: Hello, I'm facing issue with core.fsmonitor. I'm currently using the provided watchman hook, but it doesn't seem to record the fact that it has queried the fsmonitor backend, and as a result the timestamp passed to the hook doesn't seem to change.

Re: [PATCH 1/8] gpg-interface: handle bool user.signingkey

2018-04-10 Thread Jeff King
On Mon, Apr 09, 2018 at 04:55:26PM -0400, Eric Sunshine wrote: > Peff's Signed-off-by: is missing. Also, since you're forwarding this > patch on Peff's behalf, your Signed-off-by: should follow his. Same > comment applies to all patches by Peff in this series. I usually sign-off as I send to the

Re: [PATCH 12/16] refs: store the main ref store inside the repository struct

2018-04-10 Thread Michael Haggerty
On 04/10/2018 12:45 AM, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > refs.c | 13 + > refs.h | 4 +--- > repository.h | 3 +++ > 3 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/refs.c b/refs.c > index

Re: [PATCH 07/16] refs: add repository argument to get_main_ref_store

2018-04-10 Thread Michael Haggerty
On 04/10/2018 12:45 AM, Stefan Beller wrote: > Add a repository argument to allow the get_main_ref_store caller > to be more specific about which repository to handle. This is a small > mechanical change; it doesn't change the implementation to handle > repositories other than the_repository yet.

[PATCH v2 1/1] perl: fix installing modules from contrib

2018-04-10 Thread Christian Hesse
Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) removed a target that allowed Makefiles from contrib/ to get the correct install path. This introduces a new target for main Makefile and fixes installation for Mediawiki module. v2: Pass prefix as that can have influence

[PATCH v8 14/14] commit-graph: implement "--append" option

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git-commit-graph to add all commits from the existing commit-graph file to the file about to be written. This should be used when adding new commits without performing garbage collection. Signed-off-by: Derrick Stolee ---

[PATCH v8 13/14] commit-graph: build graph from starting commits

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git-commit-graph to read commits from stdin when the --stdin-commits flag is specified. Commits reachable from these commits are added to the graph. This is a much faster way to construct the graph than inspecting all packed objects, but is

[PATCH v8 11/14] commit: integrate commit graph with commit parsing

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach Git to inspect a commit graph file to supply the contents of a struct commit when calling parse_commit_gently(). This implementation satisfies all post-conditions on the struct commit, including loading parents, the root tree, and the commit

[PATCH v8 12/14] commit-graph: read only from specific pack-indexes

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git-commit-graph to inspect the objects only in a certain list of pack-indexes within the given pack directory. This allows updating the commit graph iteratively. Signed-off-by: Derrick Stolee ---

  1   2   >