Re: init --separate-git-dir does not set core.worktree

2017-02-04 Thread Kyle Meyer
Duy Nguyen writes: > On Thu, Feb 2, 2017 at 7:37 PM, Kyle Meyer wrote: [...] >> * COMMIT_EDITMSG in .git/modules//: set working tree to the >>output of "git rev-parse --show-toplevel" >> >> * COMMIT_EDITMSG in .git/worktrees//: set working tree to the

Re: [PATCH] tag: add a config option for setting --annotate by default

2017-02-04 Thread David Aguilar
On Fri, Feb 03, 2017 at 09:02:47PM -0800, Junio C Hamano wrote: > David Aguilar writes: > > > Make it easier for users to remember to annotate their tags. > > Allow setting the default value for "--annotate" via the "tag.annotate" > > configuration variable. > > > >

Re: release notes/ change number discrepancy ? - Documentation/RelNotes/2.10.0.txt "merge b738396..."

2017-02-04 Thread Junio C Hamano
Zenaan Harkness writes: > Am I missing something in the following: > > looking at Documentation/RelNotes/2.10.0.txt I see the following release > note (~line 35): > > * "upload-pack" allows a custom "git pack-objects" replacement when >responding to "fetch/clone" via the

release notes/ change number discrepancy ? - Documentation/RelNotes/2.10.0.txt "merge b738396..."

2017-02-04 Thread Zenaan Harkness
Am I missing something in the following: looking at Documentation/RelNotes/2.10.0.txt I see the following release note (~line 35): * "upload-pack" allows a custom "git pack-objects" replacement when responding to "fetch/clone" via the uploadpack.packObjectsHook. (merge b738396

[PATCH] completion: fix git svn authorship switches

2017-02-04 Thread Eric Wong
--add-author-from and --use-log-author are for "git svn dcommit", not "git svn (init|clone)" Signed-off-by: Eric Wong --- contrib/completion/git-completion.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Though, I now wonder if allowing those switches to write

Re: [PATCH v2 2/4] stash: introduce push verb

2017-02-04 Thread Thomas Gummerer
On 01/30, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Introduce a new git stash push verb in addition to git stash save. The > > push verb is used to transition from the current command line arguments > > to a more conventional way, in which the message is

Re: [PATCH v2] reset: add an example of how to split a commit into two

2017-02-04 Thread Duy Nguyen
On Sat, Feb 4, 2017 at 7:16 PM, Philip Oakley wrote: > From: "Duy Nguyen" >> >> On Sat, Feb 4, 2017 at 3:28 AM, Jacob Keller >> wrote: >>> >>> + >>> +$ git reset HEAD^ <1> >> >> >> It may be

Re: [PATCH v2 3/4] introduce new format for git stash create

2017-02-04 Thread Thomas Gummerer
On 01/30, Junio C Hamano wrote: > Thomas Gummerer writes: > > > create_stash () { > > - stash_msg="$1" > > - untracked="$2" > > + stash_msg= > > + untracked= > > + new_style= > > ... > > + while test $# != 0 > > + do > > + case "$1" in > > +

Re: topological index field for commit objects

2017-02-04 Thread Jakub Narębski
On 20 July 2016 at 15:02, Jeff King wrote: > On Wed, Jul 20, 2016 at 02:07:38AM +0200, Jakub Narębski wrote: >> W dniu 2016-06-30 o 00:00, Jeff King pisze: >>> On Wed, Jun 29, 2016 at 11:49:35PM +0200, Jakub Narębski wrote: >> Do Git use EWAH / EWOK bitmaps for reachability

[PATCH v3] parse-remote: remove reference to unused op_prep

2017-02-04 Thread Siddharth Kannan
The error_on_missing_default_upstream helper function learned to take op_prep argument with 15a147e618 ("rebase: use @{upstream} if no upstream specified", 2011-02-09), but as of 045fac5845 ("i18n: git-parse-remote.sh: mark strings for translation", 2016-04-19), the argument is no longer used.

Re: [PATCH v2] reset: add an example of how to split a commit into two

2017-02-04 Thread Philip Oakley
From: "Duy Nguyen" On Sat, Feb 4, 2017 at 3:28 AM, Jacob Keller wrote: + +$ git reset HEAD^ <1> It may be a good idea to add -N here, so that 'add -p' can pick up the new files if they are added in HEAD.

Re: Feature request: flagging “volatile” branches for integration/development

2017-02-04 Thread Duy Nguyen
On Wed, Feb 1, 2017 at 12:12 AM, Herbert, Marc wrote: > (Thanks to Josh Triplett[*] for contributing to this message) > > Hi, > > We often work with development/integration branches that regularly > rebase, in addition to stable branches that do not. Git is used to share >

Re: [PATCH v2] reset: add an example of how to split a commit into two

2017-02-04 Thread Duy Nguyen
On Sat, Feb 4, 2017 at 3:28 AM, Jacob Keller wrote: > + > +$ git reset HEAD^ <1> It may be a good idea to add -N here, so that 'add -p' can pick up the new files if they are added in HEAD. > +$ git add -p

Re: [PATCH v2] parse-remote: Remove reference to unused op_prep

2017-02-04 Thread siddharth
On Sat, Feb 04, 2017 at 04:55:45PM +0530, Pranit Bauva wrote: > Hey SIddharth, > > > Subject: parse-remote: Remove reference to unused op_prep > ^ > > Minor nit: after the colon, we generally don't use the word starting > with an uppercase letter which I

Re: How to use git show's "%<([,trunc|ltrunc|mtrunc])"?

2017-02-04 Thread Duy Nguyen
On Sat, Feb 4, 2017 at 12:10 AM, Hilco Wijbenga wrote: >>> How do I get "2017-01-31T17:02:13 | Hilco Wijbenga" to be output? >> >> You'll get an ellipsis at the end though.. (i.e. 02:13... | Hilco) > > Indeed, that's not very nice. I suppose I can understand the reason >

Re: [PATCH 00/11] nd/worktree-move update

2017-02-04 Thread Duy Nguyen
On Sat, Feb 4, 2017 at 1:25 AM, Junio C Hamano wrote: > Even if you think "the right way" is to add to the iterators, I > suspect that we can still do incremental fixes? I agree with the > order of importance Michael listed in his message (i.e. the index > and the HEAD first,

Re: [PATCH] commit: Optimize number of lstat() calls

2017-02-04 Thread Johannes Schindelin
Hi Junio, On Fri, 3 Feb 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > I could imagine that there is a third option we should consider, too: only > > lstat() and update the paths that match the pathspec(s) provided on the > > command line (this is

Re: [PATCH v2] parse-remote: Remove reference to unused op_prep

2017-02-04 Thread Pranit Bauva
Hey SIddharth, > Subject: parse-remote: Remove reference to unused op_prep ^ Minor nit: after the colon, we generally don't use the word starting with an uppercase letter which I think can be figured out when you run `git log -p git-parse-remote.sh` On

[PATCH v2] parse-remote: Remove reference to unused op_prep

2017-02-04 Thread Siddharth Kannan
The error_on_missing_default_upstream helper function learned to take op_prep argument with 15a147e618 ("rebase: use @{upstream} if no upstream specified", 2011-02-09), but as of 045fac5845 ("i18n: git-parse-remote.sh: mark strings for translation", 2016-04-19), the argument is no longer used.

Re: [PATCH 1/2] doc: add doc for git-push --recurse-submodules=only

2017-02-04 Thread Cornelius Weig
Shouldn't this be part of v2.12-rc0? I just checked but it's not there. Cheers, Cornelius

Re: [PATCH v3] parse-remote: remove reference to unused op_prep

2017-02-04 Thread Pranit Bauva
Hey Siddharth, On Sat, Feb 4, 2017 at 8:01 PM, Siddharth Kannan wrote: > The error_on_missing_default_upstream helper function learned to > take op_prep argument with 15a147e618 ("rebase: use @{upstream} > if no upstream specified", 2011-02-09), but as of 045fac5845

Re: feature request: add -q to "git branch"

2017-02-04 Thread Pranit Bauva
Hey Kevin, On Fri, Feb 3, 2017 at 11:59 PM, Kevin Layer wrote: > It should be possible to quietly create a branch. > > Thanks. > > Kevin

Re: feature request: add -q to "git branch"

2017-02-04 Thread Pranit Bauva
Hey Kevin, Sorry for the previous message. On Sun, Feb 5, 2017 at 2:47 AM, Pranit Bauva wrote: > Hey Kevin, > > On Fri, Feb 3, 2017 at 11:59 PM, Kevin Layer wrote: >> It should be possible to quietly create a branch. I think `git branch` is already

git-gui ignores core.hookspath

2017-02-04 Thread matthias.serfling
Hello, I’m running on $ git --version --build-options git version 2.11.0.windows.3 built from commit: e11df2efb3072fe73153442589129d2eb8d9ea02 sizeof-long: 4 machine: x86_64 and trying to use core.hookspath with git-gui in my local repository in windows cmd shell $ cmd.exe /c ver Microsoft

Re: Git clonebundles

2017-02-04 Thread Shawn Pearce
On Mon, Jan 30, 2017 at 11:00 PM, Stefan Saasen wrote: > > Bitbucket recently added support for Mercurial’s clonebundle extension > (http://gregoryszorc.com/blog/2015/10/22/cloning-improvements-in-mercurial-3.6/). > Mercurial’s clone bundles allow the Mercurial client to

Re: git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.

2017-02-04 Thread Stefan Beller
On Tue, Jan 31, 2017 at 5:10 PM, Carlo Wood wrote: > On Tue, 31 Jan 2017 14:08:41 -0800 > Stefan Beller wrote: > >> On Sun, Jan 29, 2017 at 5:00 PM, Junio C Hamano >> wrote: >> > 2. If the amend is good and ready to go, "git add" to