Re: [PATCHv2] git-p4: support git worktrees

On 10 December 2016 at 21:57, Luke Diamand wrote: > git-p4 would attempt to find the git directory using > its own specific code, which did not know about git > worktrees. This caused git operations to fail needlessly. > > Rework it to use "git rev-parse --git-dir" instead,

[PATCH] git-svn: document useLogAuthor and addAuthorFrom config keys

Juergen Kosel wrote: > Am 05.12.2016 um 23:54 schrieb Eric Wong: > > So, can you confirm that svn.addAuthorFrom and svn.useLogAuthor > > config keys work and can be documented? > > yes, I can confirm, that adding this configuration keys works with git > 2.1.4 work. > I

Business Opportunity

I have a business opportunity that Guarantee's you 40% of $10,500,000.00 , please contact me for more details Regards, Lim Fu

Re: [RFC PATCH] send-email: allow a custom hook to prevent sending email

Stefan Beller writes: > On Fri, Dec 9, 2016 at 3:52 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> So you are suggesting to >>> * have the check later in the game (e.g. just after asking >>>"Send this email?

Re: [PATCH v6 01/16] Git.pm: add subroutines for commenting lines

Vasco Almeida writes: > I wonder why this is important when Git errors out when > core.commentChar is set to more than 1 characters or 0 characters. I think it should be consistent with the way core.commentchar is treated in the rest of the system, namely this bit from

Re: git add -p with new file

Jeff King writes: > On Fri, Dec 09, 2016 at 01:43:24PM -0500, Ariel wrote: > ... >> But it doesn't have to be that way. You could make add -p identical to add >> without options, except the -p prompts to review diffs first. > > The question is whether you would annoy people using

[PATCHv2] git-p4 worktree support

Second attempt at teaching git-p4 about worktrees. Earlier discussion here: http://marc.info/?l=git=148097985622294 Git-p4 exports GIT_DIR so that when it chdirs into the P4 client area to apply the change, git commands called from there will work correctly. Luke Diamand (1): git-p4: support

[PATCHv2] git-p4: support git worktrees

git-p4 would attempt to find the git directory using its own specific code, which did not know about git worktrees. This caused git operations to fail needlessly. Rework it to use "git rev-parse --git-dir" instead, which knows about worktrees. Signed-off-by: Luke Diamand ---

[PATCH] branch: mark a file-local symbol with static

Signed-off-by: Ramsay Jones --- Hi Karthik, If you need to re-roll your 'kn/ref-filter-branch-list' branch, could you please squash this into the relevant patch (commit 715a4826ab, "branch: use ref-filter printing APIs", 07-12-2016). Thanks! ATB, Ramsay Jones

Re: BUG: "cherry-pick A..B || git reset --hard OTHER"

Duy Nguyen writes: > rebase and cherry-pick/revert are not exactly in the same situation. > When cherry-pick/revert in "continue/abort" mode, there's usually some > conflicted files and it's easy to notice. > > But an interactive rebase could stop at some commit with clean >

Re: [PATCH 3/4] doc: make the intent of sentence clearer

From: "Kristoffer Haugsbakk" Sent: Friday, December 09, 2016 3:51 PM By adding the word "just", which might have been accidentally omitted. Adding the word "just" makes it clear that the point is to *not* do an octopus merge simply because you *can* do it. In

Re: [PATCH 2/4] doc: add verb in front of command to run

From: "Kristoffer Haugsbakk" Sent: Friday, December 09, 2016 3:51 PM Instead of using the command 'git clone' as a verb, use "run" as the verb indicating the action of executing the command 'git clone'. I would expect 'cloning' as the commonly in use verb here,

Re: [PATCH 1/4] doc: add articles (grammar)

From: "Kristoffer Haugsbakk" Sent: Friday, December 09, 2016 3:51 PM Add definite and indefinite articles in three places where they were missing. - Use "the" in front of a directory name - Use "the" in front of "style of cooperation" - Use an indefinite article

Re: [PATCH v2 4/5] Make sequencer abort safer

On 12/10/2016 09:04 PM, Jeff King wrote: > On Sat, Dec 10, 2016 at 08:56:26PM +0100, Christian Couder wrote: > >>> +static int rollback_is_safe(void) >>> +{ >>> + struct strbuf sb = STRBUF_INIT; >>> + struct object_id expected_head, actual_head; >>> + >>> + if

Re: [PATCH v2 4/5] Make sequencer abort safer

On Sat, Dec 10, 2016 at 08:56:26PM +0100, Christian Couder wrote: > > +static int rollback_is_safe(void) > > +{ > > + struct strbuf sb = STRBUF_INIT; > > + struct object_id expected_head, actual_head; > > + > > + if (strbuf_read_file(, git_path_abort_safety_file(), 0) >= 0) { >

Re: [PATCH v2 4/5] Make sequencer abort safer

On Fri, Dec 9, 2016 at 8:01 PM, Stephan Beyer wrote: [...] > +static int rollback_is_safe(void) > +{ > + struct strbuf sb = STRBUF_INIT; > + struct object_id expected_head, actual_head; > + > + if (strbuf_read_file(, git_path_abort_safety_file(), 0) >= 0) { >

Re: Resend: Gitk: memory consumption improvements

Am 09.12.2016 um 18:57 schrieb Stefan Beller: > On Fri, Dec 9, 2016 at 3:51 AM, Markus Hitter wrote: >> >> It's a month now since I sent three patches to this list for reducing memory >> consumption of Gitk considerably: >> >>

Re: [BUG] Colon in remote urls

Hi Klaus, On Sat, 10 Dec 2016, Klaus Ethgen wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA512 > > Am Fr den 9. Dez 2016 um 22:32 schrieb Johannes Sixt: > > There are too many systems out there that use a backslash in path names. I > > don't think it is wise to use it also as the

Re: [PATCH v2 12/16] pathspec: create parse_long_magic function

Stefan Beller writes: > Jonathan Nieder mentioned off list that he prefers to see that > series rerolled without mutexes if possible. That is possible by > creating the questions "struct attr_check" before preloading the > index and then using the read only questions in the

Re: Any interest in 'git merge --continue' as a command

Jeff King writes: > No, I think your reasoning makes sense. But I also think we've already > choosen to have "--continue" mean "conclude the current, and continue if > there is anything left" in other contexts (e.g., a single-item > cherry-pick). It's more vague, but I think it

Re: [REGRESSION 2.10.2] problematic "empty auth" changes

On Sat, Dec 10, 2016 at 03:52:39PM +0100, Johannes Schindelin wrote: > One of my colleagues offered a legitimate concern: it potentially adds > another round-trip. > > Do you happen to know whether regular HTTPS negotiation will have an extra > round-trip if Kerberos is attempted, but we have to

Re: [REGRESSION 2.10.2] problematic "empty auth" changes

Hi Brian, On Fri, 9 Dec 2016, brian m. carlson wrote: > On Thu, Dec 08, 2016 at 04:12:32PM -0500, David Turner wrote: > > I know of no reason that shouldn't work. Indeed, it's what we use do > > internally. So far, nobody has reported problems. That said, we have > > exactly three sets of git

Re: [PATCH] submodule--helper: set alternateLocation for cloned submodules

On 12/08/2016 04:38 AM, vi0...@gmail.com wrote: Third review: missing && in test fixed. Shall something more be done about this or just wait until the patch gets reviewed and integrated?

Re: [PATCHv7 4/6] worktree: have a function to check if worktrees are in use

On Sat, Dec 10, 2016 at 1:49 AM, Stefan Beller wrote: > On Fri, Dec 9, 2016 at 4:00 AM, Duy Nguyen wrote: > >> int submodule_uses_worktrees(const char *path) >> { >> struct strbuf path = STRBUF_INIT; >> DIR *dir; >> struct dirent *d;

Re: Feature request: read git config from parent directory

On Friday, 9 December 2016 19:38:05 CET Duy Nguyen wrote: > >> Sounds like the same problem I have (and the reason I came up with > >> conditional include [1]). Would that work for you (check out the > >> example part in that patch)? > > > > If I understand correcly, I would need to set up config

Re: [PATCH v2 0/4] road to reentrant real_path

On Sat, Dec 10, 2016 at 2:42 AM, Brandon Williams wrote: > On 12/09, Duy Nguyen wrote: >> On Fri, Dec 9, 2016 at 6:58 AM, Brandon Williams wrote: >> > diff --git a/setup.c b/setup.c >> > index fe572b8..0d9fdd0 100644 >> > --- a/setup.c >> > +++ b/setup.c >>

Re: BUG: "cherry-pick A..B || git reset --hard OTHER"

On Sat, Dec 10, 2016 at 2:24 AM, Stephan Beyer wrote: > Hi Junio, > > On 12/09/2016 07:07 PM, Junio C Hamano wrote: >> Duy Nguyen writes: >>> Having the same operation with different names only increases git >>> reputation of bad/inconsistent UI. Either forget

Re: Any interest in 'git merge --continue' as a command

On Sat, Dec 10, 2016 at 1:00 AM, Jeff King wrote: > On Sat, Dec 10, 2016 at 09:49:13PM +1300, Chris Packham wrote: > >> > There is nothing to "continue" in a stopped merge where Git asked >> > for help from the user, and because of that, I view the final "git >> > commit" as

Re: [BUG] Colon in remote urls

-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Am Sa den 10. Dez 2016 um 11:26 schrieb Jeff King: > On Sat, Dec 10, 2016 at 10:41:33AM +0100, Klaus Ethgen wrote: > > > Am Sa den 10. Dez 2016 um 9:26 schrieb Jeff King: > > > Yeah, I picked it arbitrarily as the common quoting character, but I >

Re: [BUG] Colon in remote urls

-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi, Am Sa den 10. Dez 2016 um 11:24 schrieb Jeff King: > > A colon a perfectly allowed character in POSIX filesystems. > > Sure, it's allowed, but it will cause problems due to other syntactic > conventions. Try putting "/usr/path:with:colons"

Re: [BUG] Colon in remote urls

On Sat, Dec 10, 2016 at 10:41:33AM +0100, Klaus Ethgen wrote: > Am Sa den 10. Dez 2016 um 9:26 schrieb Jeff King: > > Yeah, I picked it arbitrarily as the common quoting character, but I > > agree it probably makes backwards compatibility (and general usability > > when you have to

Re: [BUG] Colon in remote urls

On Sat, Dec 10, 2016 at 10:29:28AM +0100, Klaus Ethgen wrote: > > I think we long time ago in 2005 have declared that a colon in a > > directory name would not work for Git repositories because of things > > like GIT_CEILING_DIRECTORIES, GIT_ALTERNATE_OBJECT_DIRECTORIES; so I > > do not think we

Re: [PATCH v6 01/16] Git.pm: add subroutines for commenting lines

A Sex, 09-12-2016 às 14:23 -0800, Junio C Hamano escreveu: > > This is exactly the same issue I fixed for rebase -i recently. > > Yes, but the patch we see here punts "core.commentChar is not a > single-byte single-letter--panic!" case differently.  I think you > did "just take the first one" in

Re: [BUG] Colon in remote urls

-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Am Sa den 10. Dez 2016 um 9:26 schrieb Jeff King: > Yeah, I picked it arbitrarily as the common quoting character, but I > agree it probably makes backwards compatibility (and general usability > when you have to double-backslash each instance)

Re: [BUG] Colon in remote urls

-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Am Fr den 9. Dez 2016 um 22:32 schrieb Johannes Sixt: > There are too many systems out there that use a backslash in path names. I > don't think it is wise to use it also as the quoting character. Well, the minority, I believe. And only the

Re: [BUG] Colon in remote urls

-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hello, Am Fr den 9. Dez 2016 um 20:07 schrieb Junio C Hamano: > Jeff King writes: > > (One other option is to just declare that the quarantine feature doesn't > > work with colons in the pathname, but stop turning it on by default.

Re: [RFC PATCH] send-email: allow a custom hook to prevent sending email

On Fri, Dec 09, 2016 at 12:34:49PM -0800, Stefan Beller wrote: > My first perl contribution to Git. :) Yes, I have some style suggestions below. :) > Marked as RFC to gauge general interest before writing tests and > documentation. It's hard to evaluate without seeing an example of what you'd

Re: Any interest in 'git merge --continue' as a command

On Sat, Dec 10, 2016 at 09:49:13PM +1300, Chris Packham wrote: > > There is nothing to "continue" in a stopped merge where Git asked > > for help from the user, and because of that, I view the final "git > > commit" as "concluding the merge", not "continuing". "continue" > > makes quite a lot of

Re: Any interest in 'git merge --continue' as a command

On Fri, Dec 09, 2016 at 11:16:52AM -0800, Junio C Hamano wrote: > > It seems like that would be in line with 35d2fffdb (Provide 'git merge > > --abort' as a synonym to 'git reset --merge', 2010-11-09), whose stated > > goal was providing consistency with other multi-command operations. > > > > I

Re: git add -p with new file

On Fri, Dec 09, 2016 at 01:43:24PM -0500, Ariel wrote: > > It's contrary to the rest of git-add for specifying pathspecs to > > actually make things _more_ inclusive rather than less. > > Is it? Because git add without -p is happy to add new files. I was just speaking there of whether the

Re: [BUG] Colon in remote urls

On Fri, Dec 09, 2016 at 11:07:25AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > (One other option is to just declare that the quarantine feature doesn't > > work with colons in the pathname, but stop turning it on by default. I'm > > not sure I like that, though). > >

Re: Any interest in 'git merge --continue' as a command

On Sat, Dec 10, 2016 at 8:16 AM, Junio C Hamano wrote: > Jeff King writes: > >>> They knew about git rebase --continue (and git am and git cherry-pick) >>> but they were unsure how to "continue" a merge (it didn't help that >>> the advice saying to use 'git

Re: [BUG] Colon in remote urls

On Fri, Dec 09, 2016 at 10:32:48PM +0100, Johannes Sixt wrote: > > + if (*p == '\\') > > + literal = 1; > > There are too many systems out there that use a backslash in path names. I > don't think it is wise to use it also as the quoting character.

Re: [PATCH 2/2] mergetools/tortoisemerge: simplify can_diff() by using "false"

Am 10.12.2016 um 04:21 schrieb David Aguilar: Signed-off-by: David Aguilar --- This patch builds upon da/mergetool-trust-exit-code mergetools/tortoisemerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge