Re: [PATCH] describe: add tests for unusual graphs

On 2016-12-09 17:12, Junio C Hamano wrote: > Quinn Grier writes: > >> git describe may give incorrect results if there are backdated commits >> or multiple roots. This commit adds two test_expect_failure tests that >> demonstrate these problems. > > I am not sure if this

[PATCH 1/2] mergetools/kompare: simplify can_merge() by using "false"

Signed-off-by: David Aguilar --- This patch builds upon da/mergetool-trust-exit-code mergetools/kompare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/kompare b/mergetools/kompare index e8c0bfa678..321022500b 100644 --- a/mergetools/kompare +++

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

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 index d7ab666a59..9067d8a4e5 100644 ---

[PATCH] mergetools: fix xxdiff hotkeys

xxdiff was using a mix of "Ctrl-" and "Ctrl+" hotkeys. The dashed "-" form is not accepted by newer xxdiff versions. Use the plus "+" form only. Signed-off-by: David Aguilar --- This patch is based on top of da/mergetool-diff-order mergetools/xxdiff | 10 +- 1 file

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

On 12/09, Stefan Beller wrote: > On Fri, Dec 9, 2016 at 3:44 PM, Junio C Hamano wrote: > > Brandon Williams writes: > > > >> Factor out the logic responsible for parsing long magic into its own > >> function. As well as hoist the prefix check logic outside

Re: [PATCH 2/3] difftool: chdir as early as possible

On Fri, Dec 09, 2016 at 03:02:09PM -0800, Junio C Hamano wrote: > David Aguilar writes: > > > @@ -182,10 +188,6 @@ EOF > > } > > } > > > > - # Go to the root of the worktree so that the left index files > > - # are properly setup -- the index is

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

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? ([y]es|[n]o|[q]uit|[a]ll): " as then other information >>

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

On Fri, Dec 9, 2016 at 3:44 PM, Junio C Hamano wrote: > Brandon Williams writes: > >> Factor out the logic responsible for parsing long magic into its own >> function. As well as hoist the prefix check logic outside of the inner >> loop as there isn't

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

Stefan Beller writes: > So you are suggesting to > * have the check later in the game (e.g. just after asking >"Send this email? ([y]es|[n]o|[q]uit|[a]ll): " as then other information > such as additional @to @cc are available. Yeah, probably before the loop starts

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

Brandon Williams writes: > Factor out the logic responsible for parsing long magic into its own > function. As well as hoist the prefix check logic outside of the inner > loop as there isn't anything that needs to be done after matching > "prefix:". > > Signed-off-by: Brandon

Re: [PATCH 0/4] doc: fixes to gitcore-tutorial.txt

Kristoffer Haugsbakk writes: > This series of patches attempts to fix some minor mistakes in > gitcore-tutorial.txt that I found while reading it. They are all > concerned with grammar and things like accidentally omitted words. Grammar is not my forte, so even

Re: [PATCH] describe: add tests for unusual graphs

Quinn Grier writes: > git describe may give incorrect results if there are backdated commits > or multiple roots. This commit adds two test_expect_failure tests that > demonstrate these problems. I am not sure if this is a good patch to take. test_expect_failure is to

Re: [PATCHv6 4/7] worktree: get worktrees from submodules

On Fri, Dec 9, 2016 at 3:00 PM, Brandon Williams wrote: > On 12/08, Stefan Beller wrote: >> On Thu, Dec 8, 2016 at 2:09 AM, Duy Nguyen wrote: >> > On Thu, Dec 8, 2016 at 8:46 AM, Stefan Beller wrote: >> >> >> >> worktree =

Re: [PATCH 2/3] difftool: chdir as early as possible

David Aguilar writes: > @@ -182,10 +188,6 @@ EOF > } > } > > - # Go to the root of the worktree so that the left index files > - # are properly setup -- the index is toplevel-relative. > - chdir($workdir); > - > # Setup temp directories >

Re: [PATCHv6 4/7] worktree: get worktrees from submodules

On 12/08, Stefan Beller wrote: > On Thu, Dec 8, 2016 at 2:09 AM, Duy Nguyen wrote: > > On Thu, Dec 8, 2016 at 8:46 AM, Stefan Beller wrote: > >> > >> worktree = xcalloc(1, sizeof(*worktree)); > >> worktree->path = strbuf_detach(_path, NULL);

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

On Fri, Dec 9, 2016 at 2:36 PM, Junio C Hamano wrote: > > I doubt that this is the best place to call this hook, because the > called hook does not have access to information that may help it > make a better decision. As the commit message may elude, I chose this place as it

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

Stefan Beller writes: > This custom hook could be used to prevent sending out e.g. patches > with change ids or other information that upstream doesn't like to see > or is not supposed to see. > > Signed-off-by: Stefan Beller > --- > > My first perl

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

Johannes Schindelin writes: > Hi Vasco, > > On Fri, 9 Dec 2016, Vasco Almeida wrote: > >> A Ter, 22-11-2016 às 09:42 -0800, Junio C Hamano escreveu: >> > The incremental update below looks sensible. We'd also want to >> > protect this codepath from a misconfigured

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

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 servers that most users talk to (two different > internal; and

Re: [BUG] Colon in remote urls

Am 09.12.2016 um 16:22 schrieb Jeff King: +const char *parse_alt_odb_entry(const char *string, int sep, + struct strbuf *out) +{ + const char *p; + int literal = 0; + + strbuf_reset(out); + + for (p = string; *p; p++) { + if

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

This custom hook could be used to prevent sending out e.g. patches with change ids or other information that upstream doesn't like to see or is not supposed to see. Signed-off-by: Stefan Beller --- My first perl contribution to Git. :) Marked as RFC to gauge general

Mr. Mathiang Puk

My Dear Friend, How are you and your family? I hope you all are fine I need your urgent assistance in transferring the sum of Eight Million United States Dollars ($8,000,000:00) into your account within 14 working banking days. I don't want the money to go into our bank treasury as an

Re: [PATCH 14/16] pathspec: create strip submodule slash helpers

On 12/09, Stefan Beller wrote: > On Fri, Dec 9, 2016 at 11:18 AM, Brandon Williams wrote: > > Factor out the logic responsible for stripping the trailing slash on > > pathspecs referencing submodules into its own function. > > > > Change-Id:

Re: [PATCH v2 1/4] real_path: resolve symlinks by hand

On 12/09, Johannes Sixt wrote: > Am 09.12.2016 um 00:58 schrieb Brandon Williams: > >The current implementation of real_path uses chdir() in order to resolve > >symlinks. Unfortunately this isn't thread-safe as chdir() affects a > >process as a whole and not just an individual thread. Instead

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

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 > > @@ -254,10 +254,12 @@ int get_common_dir_noenv(struct strbuf *sb, const > > char

Re: [PATCH 14/16] pathspec: create strip submodule slash helpers

On Fri, Dec 9, 2016 at 11:18 AM, Brandon Williams wrote: > Factor out the logic responsible for stripping the trailing slash on > pathspecs referencing submodules into its own function. > > Change-Id: Icad62647c04b4195309def0e3db416203d14f9e4 I think we should come up with a

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

Johannes Schindelin writes: > It would be different, of course, if http.emptyAuth would *not* allow the > user to type their credentials when accessing something like > https://github.com/dscho/shhh-secret-repository, *only* trying the login > credentials. But that is

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

On 12/09/2016 08:24 PM, Stephan Beyer wrote: > t3510 also shows another use-case for --quit: the title says it all: > "cherry-pick --quit" to "cherry-pick --abort" I should've read what I actually pasted. I wanted to paste: '--quit keeps HEAD and conflicted index intact' Sorry for making no

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

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 is renamed to quit, >> or vice versa. I prefer forget, but the decision is

Re: [PATCH 02/17] dir: convert create_simplify to use the pathspec struct interface

On 12/09, Duy Nguyen wrote: > On Fri, Dec 9, 2016 at 1:19 AM, Brandon Williams wrote: > > On 12/08, Duy Nguyen wrote: > >> On Thu, Dec 8, 2016 at 7:03 AM, Brandon Williams wrote: > >> > On 12/07, Duy Nguyen wrote: > >> >> On Wed, Dec 7, 2016 at 4:51 AM,

[PATCH 14/16] pathspec: create strip submodule slash helpers

Factor out the logic responsible for stripping the trailing slash on pathspecs referencing submodules into its own function. Change-Id: Icad62647c04b4195309def0e3db416203d14f9e4 Signed-off-by: Brandon Williams --- pathspec.c | 68

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

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 commit' was scrolling off the top of the >> terminal). I know that using 'git commit'

Re: [BUG] Colon in remote urls

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). I think we long time ago in 2005 have declared that a colon in a directory name

Re: [PATCH v2 00/16] pathspec cleanup

On 12/08, Junio C Hamano wrote: > Will queue, but with fixes on issues spotted by my pre-acceptance > mechanical filter squashed in, to fix style issues in the > destination of code movements. Is this pre-acceptance filter you use something that I could run locally? -- Brandon Williams

[PATCH v2 4/5] Make sequencer abort safer

In contrast to "git am --abort", a sequencer abort did not check whether the current HEAD is the one that is expected. This can lead to loss of work (when not spotted and resolved using reflog before the garbage collector chimes in). This behavior is now changed by mimicking "git am --abort": the

[PATCH v2 5/5] sequencer: Remove useless get_dir() function

This function is used only once, for the removal of the directory. It is not used for the creation of the directory nor anywhere else. Signed-off-by: Stephan Beyer --- sequencer.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sequencer.c

[PATCH v2 3/5] Add test that cherry-pick --abort does not unsafely change HEAD

The test expects failure because it is a current breakage reported by Junio C Hamano. Signed-off-by: Stephan Beyer --- t/t3510-cherry-pick-sequence.sh | 10 ++ 1 file changed, 10 insertions(+) diff --git a/t/t3510-cherry-pick-sequence.sh

[PATCH v2 1/5] am: Fix filename in safe_to_abort() error message

Signed-off-by: Stephan Beyer --- builtin/am.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/am.c b/builtin/am.c index 6981f42ce..7cf40e6f2 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2124,7 +2124,7 @@ static int safe_to_abort(const struct

[PATCH v2 2/5] am: Change safe_to_abort()'s not rewinding error into a warning

The error message tells the user that something went terribly wrong and the --abort could not be performed. But the --abort is performed, only without rewinding. By simply changing the error into a warning, we indicate the user that she must not try something like "git am --abort --force", instead

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

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; > int ret = 0; > > strbuf_addf(, "%s/worktrees", path); >

Re: git add -p with new file

On Fri, 9 Dec 2016, Jeff King wrote: On Tue, Dec 06, 2016 at 08:18:59PM -0500, Ariel wrote: If you do git add -p new_file it says: No changes. Which is a rather confusing message. I would expect it to show me the content of the file in patch form, in the normal way that -p works, let

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

Stephan Beyer writes: > However: > >> -static void update_curr_file() >> +static void update_current_file(void) > > This function name could lead to the impression that there is some > current file (defined by a global state or whatever) that is updated. > > So I'd rather rename

Re: git add -p with new file

On Wed, 7 Dec 2016, Duy Nguyen wrote: On Wed, Dec 7, 2016 at 8:18 AM, Ariel wrote: If you do git add -p new_file it says: No changes. Which is a rather confusing message. I would expect it to show me the content of the file in patch form, in the normal way that -p

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

Duy Nguyen writes: > On Thu, Dec 8, 2016 at 3:04 AM, Junio C Hamano wrote: >> Stephan Beyer writes: >> >>> [1] By the way: git cherry-pick --quit, git rebase --forget ... >>> different wording for the same thing makes things unintuitive.

Re: Resend: Gitk: memory consumption improvements

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: > > https://public-inbox.org/git/de7cd593-0c10-4e93-1681-7e123504f...@jump-ing.de/ >

Re: [PATCH/RFC 0/7] Pie-in-the-sky attempt to fix the early config

On Fri, Dec 09, 2016 at 06:28:10PM +0100, Johannes Schindelin wrote: > > Great. Thanks for taking a stab at this. > > Well, I figured that I can go through you to get this integrated into > git.git. I am not sure what you mean here, but it _sounds_ like you are continuing to be negative about

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

Hi Vasco, On Fri, 9 Dec 2016, Vasco Almeida wrote: > A Ter, 22-11-2016 às 09:42 -0800, Junio C Hamano escreveu: > > The incremental update below looks sensible.  We'd also want to > > protect this codepath from a misconfigured two-or-more byte sequence > > in core.commentchar, I would suspect,

Re: [PATCH/RFC 0/7] Pie-in-the-sky attempt to fix the early config

Hi Peff, On Thu, 8 Dec 2016, Jeff King wrote: > On Thu, Dec 08, 2016 at 04:35:56PM +0100, Johannes Schindelin wrote: > > > The idea here is to discover the .git/ directory gently (i.e. without > > changing the current working directory), and to use it to read the > > .git/config file early,

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

A Ter, 22-11-2016 às 09:42 -0800, Junio C Hamano escreveu: > The incremental update below looks sensible.  We'd also want to > protect this codepath from a misconfigured two-or-more byte sequence > in core.commentchar, I would suspect, to be consistent. Are the below changes alright for what you

Re: [PATCH/RFC 0/7] Pie-in-the-sky attempt to fix the early config

Hi Duy, On Fri, 9 Dec 2016, Duy Nguyen wrote: > On Thu, Dec 8, 2016 at 10:35 PM, Johannes Schindelin > wrote: > > Hopefully these patches will lead to something that we can integrate, > > and that eventually will make Git's startup sequence much less > > surprising.

Git 2.11.0 on OS X El Capitan 10.11.6

Hello! Thanks for taking the time to read this bug report, I am operating a mac book pro with OS X El Capitan 10.11.6 and attempting to download git 2.10.1, the installation appears to finalize with no problems but Git is not at the download destination from the designated path. Will 2.11.0 be

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

Hi David, On Thu, 8 Dec 2016, David Turner wrote: > On Thu, 2016-12-08 at 15:47 +0100, Johannes Schindelin wrote: > > > I got a couple of bug reports that claim that 2.10.2 regressed on > > using network credentials. That is, users regularly hit Enter twice > > when being asked for user name

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

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 other words, you should have a reason for doing it beyond simply having two (seemingly) independent

[PATCH 4/4] doc: omit needless "for"

What was intended was perhaps "... plumbing does for you" ("you" added), but simply omitting the word "for" is more terse and gets the intended point across just as well, if not more so. I originally went with the approach of writing "for you", but Junio C Hamano suggested this approach instead.

[PATCH 0/4] doc: fixes to gitcore-tutorial.txt

This series of patches attempts to fix some minor mistakes in gitcore-tutorial.txt that I found while reading it. They are all concerned with grammar and things like accidentally omitted words. I previously sent a single patch on 2016-11-04 ("[PATCH] doc: fill in omitted word"). The patch "doc:

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

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 in front of "CVS background" Signed-off-by: Kristoffer Haugsbakk ---

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

Instead of using the command 'git clone' as a verb, use "run" as the verb indicating the action of executing the command 'git clone'. Signed-off-by: Kristoffer Haugsbakk --- Documentation/gitcore-tutorial.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [BUG] Colon in remote urls

On Fri, Dec 09, 2016 at 03:02:15PM +0100, Klaus Ethgen wrote: > I have some repositories where I have a colon in the (local) url for a > remote. That was no problem until now but with 2.11.0, I see the > following problem: >~> git push >Counting objects: 11, done. >Delta compression

[BUG] Colon in remote urls

-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hello, I have some repositories where I have a colon in the (local) url for a remote. That was no problem until now but with 2.11.0, I see the following problem: ~> git push Counting objects: 11, done. Delta compression using up to 8

Re: [PATCH v2 3/4] real_path: create real_pathdup

Am 09.12.2016 um 00:58 schrieb Brandon Williams: +char *real_pathdup(const char *path) +{ + struct strbuf realpath = STRBUF_INIT; + char *retval = NULL; + + if(strbuf_realpath(, path, 0)) Style nit: blank after if is missing. -- Hannes

Re: [PATCH v2 1/4] real_path: resolve symlinks by hand

Am 09.12.2016 um 00:58 schrieb Brandon Williams: The current implementation of real_path uses chdir() in order to resolve symlinks. Unfortunately this isn't thread-safe as chdir() affects a process as a whole and not just an individual thread. Instead perform the symlink resolution by hand so

Assalamu`Alaikum.

Dear Sir/Madam. Assalamu`Alaikum. I am Dr mohammad ouattara, I have ($10.6 Million us dollars) to transfer into your account, I will send you more details about this deal and the procedures to follow when I receive a positive response from you, Have a great day, Dr mohammad ouattara.

Re: git add -p with new file

On Tue, Dec 06, 2016 at 08:18:59PM -0500, Ariel wrote: > If you do git add -p new_file it says: > > No changes. > > Which is a rather confusing message. I would expect it to show me the > content of the file in patch form, in the normal way that -p works, let me > edit it, etc. > > (Note: I am

Re: [PATCH v8 18/19] branch: use ref-filter printing APIs

On Wed, Dec 07, 2016 at 09:06:26PM +0530, Karthik Nayak wrote: > +const char *quote_literal_for_format(const char *s) > { > + struct strbuf buf = STRBUF_INIT; > > + strbuf_reset(); > + while (*s) { > + const char *ep = strchrnul(s, '%'); > + if (s < ep) > +

Re: Bug: git-sh-setup giving no such file or directory

> Hmm. Did you run "make install"? Or are you trying to run git directly > out of the build directory? > > If the latter, that has been unsupported for a while, though it mostly > works. The "right" way is to either set up GIT_EXEC_PATH as appropriate, > or to just .../git/bin-wrappers into your

Re: Bug: git-sh-setup giving no such file or directory

On Fri, Dec 09, 2016 at 12:00:36PM +, Paul Boyle wrote: > There appears to be an issue with the latest master. > > "git submodule init" is producing the following error: > > /home/paul.boyle/bin/git/git-sh-setup: line 46: > /home/paul.boyle/libexec/git-core/git-sh-i18n: No such file or >

[PATCH] describe: add tests for unusual graphs

git describe may give incorrect results if there are backdated commits or multiple roots. This commit adds two test_expect_failure tests that demonstrate these problems. Signed-off-by: Quinn Grier --- t/t6120-describe.sh | 48

Re: [PATCH 02/17] dir: convert create_simplify to use the pathspec struct interface

On Fri, Dec 9, 2016 at 1:19 AM, Brandon Williams wrote: > On 12/08, Duy Nguyen wrote: >> On Thu, Dec 8, 2016 at 7:03 AM, Brandon Williams wrote: >> > On 12/07, Duy Nguyen wrote: >> >> On Wed, Dec 7, 2016 at 4:51 AM, Brandon Williams >>

Re: [PATCHv6 4/7] worktree: get worktrees from submodules

On Fri, Dec 9, 2016 at 1:55 AM, Stefan Beller wrote: > On Thu, Dec 8, 2016 at 2:09 AM, Duy Nguyen wrote: >> On Thu, Dec 8, 2016 at 8:46 AM, Stefan Beller wrote: >>> >>> worktree = xcalloc(1, sizeof(*worktree)); >>>

Assalamu`Alaikum.

Dear Sir/Madam. Assalamu`Alaikum. I am Dr mohammad ouattara, I have ($10.6 Million us dollars) to transfer into your account, I will send you more details about this deal and the procedures to follow when I receive a positive response from you, Have a great day, Dr mohammad ouattara.

Re: [PATCH/RFC 0/7] Pie-in-the-sky attempt to fix the early config

On Thu, Dec 8, 2016 at 10:35 PM, Johannes Schindelin wrote: > Hopefully these patches will lead to something that we can integrate, > and that eventually will make Git's startup sequence much less > surprising. What did it surprise you with? Just curious. I can see

Re: Feature request: read git config from parent directory

On Fri, Dec 9, 2016 at 2:49 AM, Dominique Dumont wrote: > Hello > > I use the same machine for work and open-source contribution. In both cases, I > deal with a lot of repositories. Depending on whether I commit for work or > open-source activities, I must use a different mail

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

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 > @@ -254,10 +254,12 @@ int get_common_dir_noenv(struct strbuf *sb, const char > *gitdir) > if

Re: [PATCH] doc: fill in omitted word

I agree. Just writing "... what the plumbing does ..." is clearer and less redundant. I'll probably be sending a patch series that includes your proposed fix sometime soon. -- Kristoffer Haugsbakk

Re: [PATCH v2 14/16] pathspec: create strip submodule slash helpers

On Fri, Dec 9, 2016 at 7:28 AM, Junio C Hamano wrote: > Brandon Williams writes: > >> +static void strip_submodule_slash_cheap(struct pathspec_item *item) >> +{ >> + int i; >> + >> + if ((item->len >= 1 && item->match[item->len - 1] == '/') && >> +

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

On Thu, Dec 08, 2016 at 01:03:27PM -0800, Stefan Beller wrote: > +/* > + * NEEDSWORK: The values in the returned worktrees are broken, e.g. > + * the refs or path resolution is influenced by the current repository. > + */ > +static struct worktree **get_submodule_worktrees(const char *path,

Bug: git-sh-setup giving no such file or directory

Hi There appears to be an issue with the latest master. "git submodule init" is producing the following error: /home/paul.boyle/bin/git/git-sh-setup: line 46: /home/paul.boyle/libexec/git-core/git-sh-i18n: No such file or directory Broken sha: 8d7a455ed52e2a96debc080dfc011b6bb00db5d2 Checking

Resend: Gitk: memory consumption improvements

It's a month now since I sent three patches to this list for reducing memory consumption of Gitk considerably: https://public-inbox.org/git/de7cd593-0c10-4e93-1681-7e123504f...@jump-ing.de/ https://public-inbox.org/git/e09a5309-351d-d246-d272-f527f50ad...@jump-ing.de/

[PATCH] revert, cherry-pick: rename --quit to be consistent with rebase

The old --quit remains supported, just hidden away. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-cherry-pick.txt | 2 +- Documentation/git-revert.txt | 2 +- Documentation/sequencer.txt| 2 +- builtin/revert.c |

[PATCH] rebase: rename --forget to be consistent with sequencer

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-rebase.txt | 4 ++-- contrib/completion/git-completion.bash | 4 ++-- git-rebase.sh | 6 +++--- t/t3407-rebase-abort.sh| 8 4 files changed, 11 insertions(+),

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

On Thu, Dec 8, 2016 at 3:04 AM, Junio C Hamano wrote: > Stephan Beyer writes: > >> [1] By the way: git cherry-pick --quit, git rebase --forget ... >> different wording for the same thing makes things unintuitive. > > It is not too late to STOP "--forget" from

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

On December 9, 2016 1:11:27 AM PST, Jeff King wrote: >On Fri, Dec 09, 2016 at 08:57:58PM +1300, Chris Packham wrote: > >> I hit this at $dayjob recently. >> >> A developer had got themselves into a confused state when needing to >> resolve a merge conflict. >> >> They knew about

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

On Thu, 2016-12-08 at 15:47 +0100, Johannes Schindelin wrote: > Hi Dave, > > I got a couple of bug reports that claim that 2.10.2 regressed on using > network credentials. That is, users regularly hit Enter twice when being > asked for user name and password while fetching via https://, and cURL

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

On Fri, Dec 09, 2016 at 08:57:58PM +1300, Chris Packham wrote: > I hit this at $dayjob recently. > > A developer had got themselves into a confused state when needing to > resolve a merge conflict. > > They knew about git rebase --continue (and git am and git cherry-pick) > but they were unsure

[PATCH 3/3] difftool: rename variables for consistency

Always call the list of files @files. Always call the worktree $worktree. Signed-off-by: David Aguilar --- git-difftool.perl | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index

[PATCH 2/3] difftool: chdir as early as possible

Make difftool chdir to the top-level of the repository as soon as it can so that we can simplify how paths are handled. Replace construction of absolute paths via string concatenation with relative paths wherever possible. The bulk of the code no longer needs to use absolute paths.

[PATCH 1/3] difftool: sanitize $workdir as early as possible

The double-slash fixup on the $workdir variable was being performed just-in-time to avoid double-slashes in symlink targets, but the rest of the code was silently using paths with embedded "//" in them. A recent user-reported error message contained double-slashes. Eliminate the issue by

Re: git bash error

On Fri, 9 Dec 2016 11:38:55 +0530 "Karamjeet Singh" wrote: > Dear git support, > My app is crashing whenever i launch the git bash tool. I am > attaching the error log file from the event viewer. Can you please > let me know what the issue is with it. >