What's cooking in git.git (Oct 2017, #05; Tue, 24)

2017-10-23 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The topics that are cooking in

Re: [PATCH] status: do not get confused by submodules in excluded directories

2017-10-23 Thread Junio C Hamano
Johannes Schindelin writes: > We meticulously pass the `exclude` flag to the `treat_directory()` > function so that we can indicate that files in it are excluded rather > than untracked when recursing. > > But we did not yet treat submodules the same way. ...

Re: [PATCH] use filetest pragma to work with ACL

2017-10-23 Thread Junio C Hamano
Jeff King writes: >> Attached a cleanup proposal and moving the use at the top. > > Thanks, it looks good to me. I somehow missed this exchange; sorry for being late to pick it up.

Re: [RFC PATCH v2 5/5] builtin/branch: give more useful error messages when renaming

2017-10-23 Thread Kaartic Sivaraam
On Mon, 2017-10-23 at 12:44 -0700, Stefan Beller wrote: > +static void get_error_msg(struct strbuf* error_msg, const char* oldname, > unsigned old_branch_exists, > > + const char* newname, int > > new_branch_validation_result) > > nit here and in the return of

Re: [PATCH 1/5] connect: split git:// setup into a separate function

2017-10-23 Thread Stefan Beller
On Mon, Oct 23, 2017 at 6:54 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> I think once this option is given, all we have to do is pay attention to >> this option in diff.c#moved_entry_cmp/next_byte, which is best built >> on top of Peffs recent

Re: [GIT PULL] l10n updates for 2.15.0 round 2

2017-10-23 Thread Junio C Hamano
Jiang Xin writes: > Hi Junio, > > Please pull l10n updates for Git 2.15.0. > > The following changes since commit 111ef79afe185f8731920569450f6a65320f5d5f: > > Git 2.15-rc1 (2017-10-11 14:54:04 +0900) > > are available in the Git repository at: > >

[GIT PULL] l10n updates for 2.15.0 round 2

2017-10-23 Thread Jiang Xin
Hi Junio, Please pull l10n updates for Git 2.15.0. The following changes since commit 111ef79afe185f8731920569450f6a65320f5d5f: Git 2.15-rc1 (2017-10-11 14:54:04 +0900) are available in the Git repository at: git://github.com/git-l10n/git-po tags/l10n-2.15.0-rnd2 for you to fetch changes

Re: [PATCH v2 0/5] Coping with unrecognized ssh wrapper scripts in GIT_SSH

2017-10-23 Thread Junio C Hamano
Jonathan Nieder writes: > Jonathan Tan wrote: >>> On 10/23, Jonathan Nieder wrote: > If this looks good, I can reroll in a moment. >> >> Yes, this looks good. > > Thanks. Here goes. > > The interdiff is upthread. Thanks, all, for the quick review. > > Jonathan Nieder

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Junio C Hamano
Jonathan Nieder writes: > 1. First, check whether $GIT_SSH supports OpenSSH options by running > > $GIT_SSH -G > > This returns status 0 and prints configuration in OpenSSH if it > recognizes all and returns status 255 if it encounters > an unrecognized

Re: [PATCH 2/5] connect: split ssh command line options into separate function

2017-10-23 Thread Junio C Hamano
Jonathan Nieder writes: > The git_connect function is growing long. Split the portion that > discovers an ssh command and options it accepts before the service > name and path to a separate function to make it easier to read. > > No functional change intended. > >

Re: [PATCH 1/5] connect: split git:// setup into a separate function

2017-10-23 Thread Junio C Hamano
Stefan Beller writes: > I think once this option is given, all we have to do is pay attention to > this option in diff.c#moved_entry_cmp/next_byte, which is best built > on top of Peffs recent fixes origin/jk/diff-color-moved-fix. > Would that be of interest for people? Two

[ANNOUNCE] Git for Windows 2.14.3

2017-10-23 Thread Johannes Schindelin
Dear Git users, It is my pleasure to announce that Git for Windows 2.14.3 is available from: https://git-for-windows.github.io/ Filename | SHA-256 | --- Git-2.14.3-64-bit.exe | 9610e082b823beb7f0da91a98d9f73e1f3f2430c21b2c4e15517dea4f981be3f Git-2.14.3-32-bit.exe |

Re: [PATCH 1/5] connect: split git:// setup into a separate function

2017-10-23 Thread Junio C Hamano
Jonathan Nieder writes: > The git_connect function is growing long. Split the > PROTO_GIT-specific portion to a separate function to make it easier to > read. > > No functional change intended. > > Signed-off-by: Jonathan Nieder > Reviewed-by: Stefan

Re: [PATCH 0/3] making test-suite tracing more useful

2017-10-23 Thread Jeff King
On Mon, Oct 23, 2017 at 01:04:45PM +0200, Johannes Schindelin wrote: > > Johannes, I've seen that you do "-x" in the tests that the > > git-for-windows bot uses to comment on GitHub. You may have seen the > > bogus failure in t5615, which this series should fix (you may also have > > seen the

Re: [PATCH 4/3] t/Makefile: introduce TEST_SHELL_PATH

2017-10-23 Thread Jeff King
On Mon, Oct 23, 2017 at 01:01:42PM +0200, Johannes Schindelin wrote: > On Fri, 20 Oct 2017, Jeff King wrote: > > > @@ -2350,6 +2357,7 @@ GIT-LDFLAGS: FORCE > > # and the first level quoting from the shell that runs "echo". > > GIT-BUILD-OPTIONS: FORCE > > @echo SHELL_PATH=\''$(subst

Re: [PATCH v2] column: show auto columns when pager is active

2017-10-23 Thread Jonathan Nieder
Junio C Hamano wrote: > Subject: column: do not include pager.c > > Everything this file needs from the pager API (e.g. term_columns(), > pager_in_use()) is already declared in the header file it includes. > > Noticed-by: Jonathan Nieder > Signed-off-by: Junio C Hamano

Re: [PATCH v2] column: show auto columns when pager is active

2017-10-23 Thread Junio C Hamano
Jonathan Nieder writes: > Hi, > > Kevin Daudt wrote: > >> --- a/column.c >> +++ b/column.c >> @@ -5,6 +5,7 @@ >> #include "parse-options.h" >> #include "run-command.h" >> #include "utf8.h" >> +#include "pager.c" > > Should this be pager.h? Ouch. And I was not paying

Re: [PATCH] builtin/push.c: add push.pushOption config

2017-10-23 Thread Junio C Hamano
Marius Paliga writes: > Push options need to be given explicitly, via the command line as "git > push --push-option ". Add the config option push.pushOption, > which is a multi-valued option, containing push options that are sent > by default. > > When push options are

Re: [PATCH 2/2] fetch, push: keep separate lists of submodules and gitlinks

2017-10-23 Thread Junio C Hamano
Heiko Voigt writes: > Why sorry? For me it is actually interesting to see you basically coming > to the same conclusions. I find it also assuring to see that two people not constantly working together closely come to the same conclusion. Thanks.

Re: [Alt. PATCH] ls-remote: deprecate -h as short for --heads

2017-10-23 Thread Junio C Hamano
René Scharfe writes: > Am 21.10.2017 um 14:18 schrieb Junio C Hamano: >> René Scharfe writes: >> >>> FWIW, I use "-?" for that everywhere. I have yet to find a command or >>> environment where it does something dangerous. >> >> Yeah, it would have made the world a

Question about purge git history

2017-10-23 Thread Kai Zhang
Hi I have a git repository on server side, and a client keep pulling this repository periodically. After a while this repository gets very big (even after git gc), and since history is not very important to us, a purge strategy is needed. I did some research on internet, and found two methods

[WIP PATCH] diff: add option to ignore whitespaces for move detection only

2017-10-23 Thread Stefan Beller
Signed-off-by: Stefan Beller --- diff.c | 10 ++-- diff.h | 1 + t/t4015-diff-whitespace.sh | 114 - See, only 10 lines of code! (and a few more for tests) We have run out of space in

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Stefan Beller
>> This is the main one. Simplified by making "auto" behave the same as >> unset. > > I still don't see the benefit of allowing a user to explicitly set > 'auto' then, if setting it to 'auto' is effectively a noop. But maybe > there's something I'm not seeing. > If /etc/gitconfig says SSH, and

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Brandon Williams
On 10/23, Jonathan Nieder wrote: > Android's "repo" tool is a tool for managing a large codebase > consisting of multiple smaller repositories, similar to Git's > submodule feature. Starting with Git 94b8ae5a (ssh: introduce a > 'simple' ssh variant, 2017-10-16), users noticed that it stopped >

[PATCH 5/5] ssh: 'simple' variant does not support --port

2017-10-23 Thread Jonathan Nieder
When trying to connect to an ssh:// URL with port explicitly specified and the ssh command configured with GIT_SSH does not support such a setting, it is less confusing to error out than to silently suppress the port setting and continue. This requires updating the GIT_SSH setting in

[PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Jonathan Nieder
Android's "repo" tool is a tool for managing a large codebase consisting of multiple smaller repositories, similar to Git's submodule feature. Starting with Git 94b8ae5a (ssh: introduce a 'simple' ssh variant, 2017-10-16), users noticed that it stopped handling the port in ssh:// URLs. The

[PATCH 4/5] ssh: 'simple' variant does not support -4/-6

2017-10-23 Thread Jonathan Nieder
If the user passes -4/--ipv4 or -6/--ipv6 to "git fetch" or "git push" and the ssh command configured with GIT_SSH does not support such a setting, error out instead of ignoring the option and continuing. Signed-off-by: Jonathan Nieder Acked-by: Stefan Beller

[PATCH 2/5] connect: split ssh command line options into separate function

2017-10-23 Thread Jonathan Nieder
The git_connect function is growing long. Split the portion that discovers an ssh command and options it accepts before the service name and path to a separate function to make it easier to read. No functional change intended. Signed-off-by: Jonathan Nieder Reviewed-by:

[PATCH 1/5] connect: split git:// setup into a separate function

2017-10-23 Thread Jonathan Nieder
The git_connect function is growing long. Split the PROTO_GIT-specific portion to a separate function to make it easier to read. No functional change intended. Signed-off-by: Jonathan Nieder Reviewed-by: Stefan Beller --- As before, except with

[PATCH v2 0/5] Coping with unrecognized ssh wrapper scripts in GIT_SSH

2017-10-23 Thread Jonathan Nieder
Jonathan Tan wrote: >> On 10/23, Jonathan Nieder wrote: >>> If this looks good, I can reroll in a moment. > > Yes, this looks good. Thanks. Here goes. The interdiff is upthread. Thanks, all, for the quick review. Jonathan Nieder (5): connect: split git:// setup into a separate function

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Jonathan Nieder
Brandon Williams wrote: > On 10/23, Jonathan Nieder wrote: >> Separately from how to document it, what do you think a good behavior >> would be? Should the "auto" configuration trigger command line based >> detection just like no configuration at all? Should the "auto" value >> for

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Jonathan Tan
On Mon, 23 Oct 2017 15:51:06 -0700 Brandon Williams wrote: > On 10/23, Jonathan Nieder wrote: > > Separately from how to document it, what do you think a good behavior > > would be? Should the "auto" configuration trigger command line based > > detection just like no

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Jonathan Nieder
Stefan Beller wrote: > On Mon, Oct 23, 2017 at 2:31 PM, Jonathan Nieder wrote: >> 1. First, check whether $GIT_SSH supports OpenSSH options by running >> >> $GIT_SSH -G >> >> This returns status 0 and prints configuration in OpenSSH if it >> recognizes all

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Brandon Williams
On 10/23, Jonathan Nieder wrote: > Hi, > > Jonathan Tan wrote: > > > The new documentation seems to imply that setting ssh.variant (or > > GIT_SSH_VARIANT) to "auto" is equivalent to not setting it at all, but > > looking at the code, it doesn't seem to be the case (not setting it at > > all

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Jonathan Nieder
Hi, Jonathan Tan wrote: > The new documentation seems to imply that setting ssh.variant (or > GIT_SSH_VARIANT) to "auto" is equivalent to not setting it at all, but > looking at the code, it doesn't seem to be the case (not setting it at > all invokes checking the first word of core.sshCommand,

Re: [PATCH 5/5] ssh: 'simple' variant does not support --port

2017-10-23 Thread Stefan Beller
On Mon, Oct 23, 2017 at 2:33 PM, Jonathan Nieder wrote: > When trying to connect to an ssh:// URL with port explicitly specified > and the ssh command configured with GIT_SSH does not support such a > setting, it is less confusing to error out than to silently suppress > the

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Stefan Beller
On Mon, Oct 23, 2017 at 2:31 PM, Jonathan Nieder wrote: > 1. First, check whether $GIT_SSH supports OpenSSH options by running > > $GIT_SSH -G > > This returns status 0 and prints configuration in OpenSSH if it > recognizes all and returns status 255 if it

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Jonathan Tan
On Mon, 23 Oct 2017 14:31:59 -0700 Jonathan Nieder wrote: > @@ -2083,14 +2083,19 @@ visited as a result of a redirection do not > participate in matching. > ssh.variant:: > Depending on the value of the environment variables `GIT_SSH` or > `GIT_SSH_COMMAND`, or

Re: [PATCH 1/5] connect: split git:// setup into a separate function

2017-10-23 Thread Stefan Beller
On Mon, Oct 23, 2017 at 2:29 PM, Jonathan Nieder wrote: > The git_connect function is growing long. Split the > PROTO_GIT-specific portion to a separate function to make it easier to > read. > > No functional change intended. > > Signed-off-by: Jonathan Nieder

Re: [PATCH v2] column: show auto columns when pager is active

2017-10-23 Thread Jonathan Nieder
Hi, Kevin Daudt wrote: > --- a/column.c > +++ b/column.c > @@ -5,6 +5,7 @@ > #include "parse-options.h" > #include "run-command.h" > #include "utf8.h" > +#include "pager.c" Should this be pager.h? Thanks, Jonathan

Re: [PATCH 2/5] connect: split ssh command line options into separate function

2017-10-23 Thread Stefan Beller
On Mon, Oct 23, 2017 at 2:30 PM, Jonathan Nieder wrote: > The git_connect function is growing long. Split the portion that > discovers an ssh command and options it accepts before the service > name and path to a separate function to make it easier to read. > > No functional

[PATCH 5/5] ssh: 'simple' variant does not support --port

2017-10-23 Thread Jonathan Nieder
When trying to connect to an ssh:// URL with port explicitly specified and the ssh command configured with GIT_SSH does not support such a setting, it is less confusing to error out than to silently suppress the port setting and continue. This requires updating the GIT_SSH setting in

[PATCH 4/5] ssh: 'simple' variant does not support -4/-6

2017-10-23 Thread Jonathan Nieder
If the user passes -4/--ipv4 or -6/--ipv6 to "git fetch" or "git push" and the ssh command configured with GIT_SSH does not support such a setting, error out instead of ignoring the option and continuing. Signed-off-by: Jonathan Nieder --- connect.c| 25

[PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

2017-10-23 Thread Jonathan Nieder
Android's "repo" tool is a tool for managing a large codebase consisting of multiple smaller repositories, similar to Git's submodule feature. Starting with Git 94b8ae5a (ssh: introduce a 'simple' ssh variant, 2017-10-16), users noticed that it stopped handling the port in ssh:// URLs. The

[PATCH 2/5] connect: split ssh command line options into separate function

2017-10-23 Thread Jonathan Nieder
The git_connect function is growing long. Split the portion that discovers an ssh command and options it accepts before the service name and path to a separate function to make it easier to read. No functional change intended. Signed-off-by: Jonathan Nieder --- connect.c |

[PATCH 1/5] connect: split git:// setup into a separate function

2017-10-23 Thread Jonathan Nieder
The git_connect function is growing long. Split the PROTO_GIT-specific portion to a separate function to make it easier to read. No functional change intended. Signed-off-by: Jonathan Nieder --- connect.c | 103 +++---

[PATCH 0/5] Coping with unrecognized ssh wrapper scripts in GIT_SSH

2017-10-23 Thread Jonathan Nieder
Hi, Brandon Williams wrote: > On 10/03, Jonathan Nieder wrote: >> What happens if I specify a ssh://host:port/path URL and the SSH >> implementation is of 'simple' type? > > The port would only be sent if your ssh command supported it. Thanks again for this patch. William Yan (cc-ed) ran into

1 Unread Message

2017-10-23 Thread Mr James Amin
Good day, I am Mr James Amin, I am Requesting for your partnership in re-profiling funds, Contact me for more details. Thanks, Mr James Amin

Re: [RFC PATCH v2 5/5] builtin/branch: give more useful error messages when renaming

2017-10-23 Thread Stefan Beller
On Mon, Sep 25, 2017 at 1:20 AM, Kaartic Sivaraam wrote: > builtin/branch.c | 41 +++-- > 1 file changed, 35 insertions(+), 6 deletions(-) The code of 4 and 5 looks good to me, though a small nit below. Thanks, Stefan > +static

Re: [RFC PATCH v2 2/5] branch: re-order function arguments to group related arguments

2017-10-23 Thread Stefan Beller
On Fri, Oct 20, 2017 at 7:56 PM, Kaartic Sivaraam wrote: > On Fri, 2017-10-20 at 14:50 -0700, Stefan Beller wrote: >> On Mon, Sep 25, 2017 at 1:20 AM, Kaartic Sivaraam >> wrote: >> > The ad-hoc patches to add new arguments to a function

Re: [PATCH v3 0/4] Implement git stash as a builtin command

2017-10-23 Thread Joel Teichroeb
Hi Johannes, I fixed all the tests at that time, but another one was added that I could not figure out how to fix. I was planning to break the commit up into smaller parts and only convert one stash command at a time calling them still from the shell script. I haven't had time to do that yet

Re: [PATCH 2/2] fetch, push: keep separate lists of submodules and gitlinks

2017-10-23 Thread Stefan Beller
On Mon, Oct 23, 2017 at 7:12 AM, Heiko Voigt wrote: > On Thu, Oct 19, 2017 at 11:11:09AM -0700, Stefan Beller wrote: >> Currently when fetching we collect the names of submodules to be fetched >> in a list. As we also want to support fetching 'gitlinks, that happen to >> have a

Re: [PATCH 1/2] t5526: check for name/path collision in submodule fetch

2017-10-23 Thread Stefan Beller
>> + git add submodule && > > A small note even though this is not meant for inclusion: This would > break when I start working on teaching 'git add' to set default values > in .gitmodules when available. Yes. I should have used something like: git update-index --add --cacheinfo

Re: "Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

2017-10-23 Thread Stefan Beller
On Sun, Oct 22, 2017 at 5:36 PM, Jeff King wrote: > On Sun, Oct 22, 2017 at 07:54:57PM +0530, Kaartic Sivaraam wrote: > >> On Fri, 2017-10-20 at 13:45 -0700, Stefan Beller wrote: >> > >> > The git-test from Michael sounds intriguing. Initially I put off using >> > it as I had my

[PATCH v4 4/4] status: test ignored modes

2017-10-23 Thread Jameson Miller
Add tests around status reporting ignord files that match an exclude pattern for both --untracked-files=normal and --untracked-files=all. Signed-off-by: Jameson Miller --- t/t7521-ignored-mode.sh | 233 1 file changed, 233

[PATCH v4 2/4] status: report matching ignored and normal untracked

2017-10-23 Thread Jameson Miller
Teach status command to handle `--ignored=matching` with `--untracked-files=normal` Signed-off-by: Jameson Miller --- dir.c | 20 ++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index b9af87eca9..20457724c0 100644 ---

[PATCH v4 1/4] status: add option to show ignored files differently

2017-10-23 Thread Jameson Miller
Teach the status command more flexibility in how ignored files are reported. Currently, the reporting of ignored files and untracked files are linked. You cannot control how ignored files are reported independently of how untracked files are reported (i.e. `all` vs `normal`). This makes it

[PATCH v4 3/4] status: document options to show matching ignored files

2017-10-23 Thread Jameson Miller
Signed-off-by: Jameson Miller --- Documentation/git-status.txt | 21 +- Documentation/technical/api-directory-listing.txt | 27 +++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git

[PATCH v4 0/4] status: add option to show ignored files differently

2017-10-23 Thread Jameson Miller
The previous iteration can be found here: https://public-inbox.org/git/20171019160601.9382-1-jam...@microsoft.com/ Changes from V3 patch series: - Added extra test for --ignored=no an --ignored=traditional - Updated wording from "folders" -> "directories" - Renamed test to a name not taken

Re: git send-email does not work with Google anymore?!

2017-10-23 Thread Dennis Kaarsemaker
On Thu, 2017-10-05 at 12:52 +0200, Lars Schneider wrote: > Hi, > > I used to use the Google SMTP server to send my patches to the list with > the following config: >8 --- > Apparently that stopped working today. I get this error: > > (mbox) Adding cc: Lars Schneider

Re: [Alt. PATCH] ls-remote: deprecate -h as short for --heads

2017-10-23 Thread René Scharfe
Am 21.10.2017 um 14:18 schrieb Junio C Hamano: > René Scharfe writes: > >> FWIW, I use "-?" for that everywhere. I have yet to find a command or >> environment where it does something dangerous. > > Yeah, it would have made the world a better place if we made that > choice back

REMINDER: KINDLY WRITE BACK.

2017-10-23 Thread Lawson Banku
Good morning, I hope you are doing great today . My name is Lawson Banku.Kindly confirm the receipt of my previous letter to you. Lawson.

Re: [PATCH 1/2] t5526: check for name/path collision in submodule fetch

2017-10-23 Thread Heiko Voigt
On Thu, Oct 19, 2017 at 11:11:08AM -0700, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > > This is just to test the corner case we're discussing. > Applies on top of origin/hv/fetch-moved-submodules-on-demand. > > > t/t5526-fetch-submodules.sh | 42

Re: [PATCH 2/2] fetch, push: keep separate lists of submodules and gitlinks

2017-10-23 Thread Heiko Voigt
On Thu, Oct 19, 2017 at 11:11:09AM -0700, Stefan Beller wrote: > Currently when fetching we collect the names of submodules to be fetched > in a list. As we also want to support fetching 'gitlinks, that happen to > have a repo checked out at the right place', we'll just pretend that these > are

Re: [PATCH 4/4] fsmonitor: Delay updating state until after split index is merged

2017-10-23 Thread Ben Peart
On 10/23/2017 5:57 AM, Johannes Schindelin wrote: Hi Peff, On Fri, 20 Oct 2017, Jeff King wrote: On Fri, Oct 20, 2017 at 03:16:20PM +0200, Johannes Schindelin wrote: void tweak_fsmonitor(struct index_state *istate) { + int i; + + if (istate->fsmonitor_dirty) { +

Re: [PATCH 0/6] Create Git/Packet.pm

2017-10-23 Thread Philip Oakley
Hi Junio, From: "Junio C Hamano" Christian Couder writes: Goal Totally offtopic, but is it only me who finds these "section headers" in cover letters from some people irritating and/or jarring? Personally I find that, for significant

[PATCH] builtin/push.c: add push.pushOption config

2017-10-23 Thread Marius Paliga
Push options need to be given explicitly, via the command line as "git push --push-option ". Add the config option push.pushOption, which is a multi-valued option, containing push options that are sent by default. When push options are set in the lower-priority configulation file (e.g.

checking out from branch A to branch B brings along a folder from A. Why

2017-10-23 Thread Yubin Ruan
Hi, I got three branch: master, A, B. I have a directory in branch A: "/path/to/repo/somefolder" (and that folder is in the working tree, not working directory), but that folder doesn't exist in either branch B or master. When in branch A, if I do $ git checkout B that "somefolder" will be

Re: [PATCH v3 0/4] Implement git stash as a builtin command

2017-10-23 Thread Johannes Schindelin
Hi Joel, On Sun, 28 May 2017, Joel Teichroeb wrote: > I've rewritten git stash as a builtin c command. All tests pass, > and I've added two new tests. Test coverage is around 95% with the > only things missing coverage being error handlers. I am embarrassed to say that I never found the time to

Re: [PATCH 0/3] making test-suite tracing more useful

2017-10-23 Thread Johannes Schindelin
Hi Peff, On Thu, 19 Oct 2017, Jeff King wrote: > I sometimes run git's test suite as part of an automated testing > process. I was hoping to add "-x" support to get more details when a > test fails (since failures are sometimes hard to reproduce). Thank you for working on this. > Johannes,

Re: [PATCH 4/3] t/Makefile: introduce TEST_SHELL_PATH

2017-10-23 Thread Johannes Schindelin
Hi Peff, On Fri, 20 Oct 2017, Jeff King wrote: > @@ -2350,6 +2357,7 @@ GIT-LDFLAGS: FORCE > # and the first level quoting from the shell that runs "echo". > GIT-BUILD-OPTIONS: FORCE > @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@+ > + @echo TEST_SHELL_PATH=\''$(subst

Re: [PATCH 3/3] test-lib: make "-x" work with "--verbose-log"

2017-10-23 Thread Johannes Schindelin
Hi Peff, On Thu, 19 Oct 2017, Jeff King wrote: > [...] > override --verbose-log, 2017-09-05). Namely, let's enable > --verbose only when we there isn't a more specific verbosity > option indicated. s/we there/we know that there/ Thanks, Dscho

Re: [PATCH 4/4] fsmonitor: Delay updating state until after split index is merged

2017-10-23 Thread Johannes Schindelin
Hi Peff, On Fri, 20 Oct 2017, Jeff King wrote: > On Fri, Oct 20, 2017 at 03:16:20PM +0200, Johannes Schindelin wrote: > > > > void tweak_fsmonitor(struct index_state *istate) > > > { > > > + int i; > > > + > > > + if (istate->fsmonitor_dirty) { > > > + /* Mark all entries valid */ > >

Re: Git for Windows v2.15.0-rc prerelease, was Re: [ANNOUNCE] Git v2.15.0-rc2

2017-10-23 Thread Johannes Schindelin
Hi Bryan, On Fri, 20 Oct 2017, Bryan Turner wrote: > On Fri, Oct 20, 2017 at 3:22 PM, Johannes Schindelin > wrote: > > > > On Fri, 20 Oct 2017, Junio C Hamano wrote: > > > >> A release candidate Git v2.15.0-rc2 is now available for testing at > >> the usual places. >

Re: [RFE] Add minimal universal release management capabilities to GIT

2017-10-23 Thread nicolas . mailhot
- Mail original - De: "Randall S. Becker" >> Git is a wonderful tool, which has transformed how software is created, and >> made code sharing and reuse, a lot easier (both >> between human and software tools). >> Please please please add release handling and versioning capabilities

Re: [RFE] Add minimal universal release management capabilities to GIT

2017-10-23 Thread nicolas . mailhot
- Mail original - De: "Kaartic Sivaraam" > > Heads up, I'm gonna play the devil's advocate a little, here. Be my guest, you're not alone. On Sat, 2017-10-21 at 15:56 +0200, nicolas.mail...@laposte.net wrote: > No that is not up to the hash function. First because hashes are too > long

Re: [PATCH v3 0/3] deprecate git stash save

2017-10-23 Thread Robert P. J. Day
On Mon, 23 Oct 2017, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Interdiff below: > > Thanks. Looks much more polished. > > > > > diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt > > index 89b6a0e672..8be661007d 100644 > > ---

Re: [PATCH v3 0/3] deprecate git stash save

2017-10-23 Thread Junio C Hamano
Jeff King writes: > On Mon, Oct 23, 2017 at 10:19:38AM +0900, Junio C Hamano wrote: > >> > - This option is deprecated in favour of 'git stash push'. >> > + This option is deprecated in favour of 'git stash push'. It >> > + differs from "stash push" in that it cannot take

[ANNOUNCE] Git v2.14.3

2017-10-23 Thread Junio C Hamano
The latest maintenance release Git v2.14.3 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.14.3' tag and the 'maint' branch that the tag points at: url =