Did You Get My Message This Time?

Friedrich MayrhoferThis is the second time i am sending you this mail.I, Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for more details. Regards. Friedrich Mayrhofer

dangling commits in worktree

Hi, More or less by error I used the fsck command in a worktree and I had the surprised to see that it reported a lot of dangling commits while it was not supposed to have one. I quickly realized that it was the case only in the worktree, in the main dir things were OK. While experimenting a bit

Re: [PATCH 2/3] stripspace: respect repository config

On Tue, Nov 22, 2016 at 01:55:07PM -0800, Junio C Hamano wrote: > > And this test makes sense. Even without "sub", it would show the > > regression, but it's a good idea to test the sub-directory case to cover > > the path-munging. > > Yup. Obviously during my initial attempt I was scratching

Re: [PATCH v5 5/6] grep: enable recurse-submodules to work on objects

On 11/22, Junio C Hamano wrote: > Brandon Williams writes: > > >> > So this change may have an impact on "git ls-tree -r" with pathspec; > >> > I offhand do not know if that impact is undesirable or not. A test > >> > or two may be in order to illustrate what happens? With a

Re: [PATCH v5 5/6] grep: enable recurse-submodules to work on objects

Brandon Williams writes: >> > So this change may have an impact on "git ls-tree -r" with pathspec; >> > I offhand do not know if that impact is undesirable or not. A test >> > or two may be in order to illustrate what happens? With a submodule >> > at "sub/module", running

Announce: delaying 2.11 final by one week

We'd like to cook and merge a few hot-fix topics to 'master' before the upcoming release, in order to fix minor regressions in "stripspace" (which affects "rebase -i"), "archive" and "mailinfo" that were introduced during this cycle. So I'll be cutting -rc3 soon this week, and hopefully tagging

Re: [PATCH v5 5/6] grep: enable recurse-submodules to work on objects

On 11/22, Brandon Williams wrote: > On 11/22, Junio C Hamano wrote: > > Brandon Williams writes: > > > > > diff --git a/tree-walk.c b/tree-walk.c > > > index 828f435..ff77605 100644 > > > --- a/tree-walk.c > > > +++ b/tree-walk.c > > > @@ -1004,6 +1004,19 @@ static enum

Re: [PATCH v5 5/6] grep: enable recurse-submodules to work on objects

On 11/22, Junio C Hamano wrote: > Brandon Williams writes: > > > diff --git a/tree-walk.c b/tree-walk.c > > index 828f435..ff77605 100644 > > --- a/tree-walk.c > > +++ b/tree-walk.c > > @@ -1004,6 +1004,19 @@ static enum interesting do_match(const struct > > name_entry

Re: [PATCH v5 5/6] grep: enable recurse-submodules to work on objects

Brandon Williams writes: > diff --git a/tree-walk.c b/tree-walk.c > index 828f435..ff77605 100644 > --- a/tree-walk.c > +++ b/tree-walk.c > @@ -1004,6 +1004,19 @@ static enum interesting do_match(const struct > name_entry *entry, >*/ >

Re: [PATCHv4 0/3] submodule-config: clarify/cleanup docs and header

Series looks good to me. At least the issues I raised are fixed. -- Brandon Williams

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

Jiang Xin writes: > Git 2.11.0-rc2 introduced a very small l10n update. Because the > update windows will be > closed tomorrow, I made a batch updates. See commit: > > * https://github.com/git-l10n/git-po/commit/275588f93 > > I have a reduced diff for this commit using

Re: [PATCH 2/3] stripspace: respect repository config

Jeff King writes: >> +test_expect_success 'mailinfo with mailinfo.scissors config' ' >> +test_config mailinfo.scissors true && >> +( >> +mkdir sub && >> +cd sub && >> +git mailinfo ../msg0014.sc ../patch0014.sc <../0014 >>

Re: [PATCH 2/3] stripspace: respect repository config

On Tue, Nov 22, 2016 at 01:22:24PM -0800, Junio C Hamano wrote: > OK. The "mailinfo" part turns out a bit more than RUN_SETUP_GENTLY > as it takes paths from the command line that needs to be adjusted > for the prefix. I wondered at first if our lack of parse-options here was holding us back

Re: [PATCH 2/3] stripspace: respect repository config

On Tue, Nov 22, 2016 at 04:19:20PM -0500, Jeff King wrote: > > > Do you want to do another round of -rc3? Ship with the > > > minor regressions and fix them up in v2.11.1? > > > > I am leaning towards the former (though we may also end up doing the > > latter). > > I think I'd lead towards

Re: [PATCH 2/3] stripspace: respect repository config

Jeff King writes: > On Tue, Nov 22, 2016 at 12:24:15PM -0800, Junio C Hamano wrote: > >> > Do you want to do another round of -rc3? Ship with the >> > minor regressions and fix them up in v2.11.1? >> >> I am leaning towards the former (though we may also end up doing the >>

Re: [PATCH 2/3] stripspace: respect repository config

On Tue, Nov 22, 2016 at 12:24:15PM -0800, Junio C Hamano wrote: > > Do you want to do another round of -rc3? Ship with the > > minor regressions and fix them up in v2.11.1? > > I am leaning towards the former (though we may also end up doing the > latter). I think I'd lead towards -rc3, as

Re: [PATCH] git-gui: pass the branch name to git merge

Am 22.11.2016 um 20:16 schrieb Junio C Hamano: Can't this be handled on the "git merge FETCH_HEAD" codepath instead? Absolutely. Any takers? ;) -- Hannes

Re: [PATCH 2/3] stripspace: respect repository config

Jeff King writes: > So what do you want to do for v2.11? I think there are minor regressions > in stripspace, archive, and mailinfo with respect to reading > .git/config. The right solution in each case is to do a gentle repo > setup. We have patches for stripspace already, but

[PATCHv4 2/3] submodule-config: rename commit_sha1 to treeish_name

It is also possible to pass in any treeish name to lookup a submodule config. Make it clear by naming the variables accordingly. Looking up a submodule config by tree hash will come in handy in a later patch. Signed-off-by: Stefan Beller ---

[PATCHv4 3/3] submodule-config: clarify parsing of null_sha1 element

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- Documentation/technical/api-submodule-config.txt | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/technical/api-submodule-config.txt

[PATCHv4 1/3] submodule config: inline config_from_{name, path}

There is no other user of config_from_{name, path}, such that there is no reason for the existence of these one liner functions. Just inline these to increase readability. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule-config.c |

[PATCHv4 0/3] submodule-config: clarify/cleanup docs and header

replacing sb/submodule-config-cleanup v4: * renamed commit_or_tree to treeish_name * added a test with a tag * "it will overwrite" (removed the spurious "be"). v3: diff to current origin/sb/submodule-config-cleanup: diff --git a/Documentation/technical/api-submodule-config.txt

Re: [PATCHv2 2/3] submodule-config: rename commit_sha1 to commit_or_tree

On Mon, Nov 21, 2016 at 7:37 PM, Junio C Hamano wrote: > Doesn't (the) "above", aka submodule_from_path() want the same > treatment? fixed in a resend. > I do not think the commit-sha1 (or commit-or-tree-object-name) is > "ITS" object name for the submodule. The name

Re: [PATCH 2/3] stripspace: respect repository config

On Tue, Nov 22, 2016 at 11:10:25AM -0800, Junio C Hamano wrote: > Archive & Upload-archive: > > "cd Documentation && git archive --remote=origin" immediately hits > "BUG: setup_git_env called without repository" if your Git is built > with b1ef400eec ("setup_git_env: avoid blind fall-back to

[PATCH] SQUASH

Signed-off-by: Stefan Beller --- On Tue, Nov 22, 2016 at 11:22 AM, Stefan Beller wrote: > When a submodule has its git dir inside the working dir, the submodule > support for checkout that we plan to add in a later patch will fail. > > Add functionality

Re: Fwd: git diff with “--word-diff-regex” extremely slow compared to “--word-diff”?

On Tue, Nov 22, 2016 at 10:08:33AM -0800, Matthieu S wrote: > You are right, I should have compared with the same regex, and indeed, > --word-diff-regex=[^[:space:]] is also much slower than just > --word-diff, although they do the same job. Maybe this is a hint that > the --word-diff-regex code

[PATCHv2 4/4] submodule: add embed-git-dir function

When a submodule has its git dir inside the working dir, the submodule support for checkout that we plan to add in a later patch will fail. Add functionality to migrate the git directory to be embedded into the superprojects git directory. Signed-off-by: Stefan Beller ---

[PATCHv2 3/4] test-lib-functions.sh: teach test_commit -C

Specifically when setting up submodule tests, it comes in handy if we can create commits in repositories that are not at the root of the tested trash dir. Add "-C " similar to gits -C parameter that will perform the operation in the given directory. Signed-off-by: Stefan Beller

[PATCHv2 2/4] submodule helper: support super prefix

Just like main commands in Git, the submodule helper needs access to the superproject prefix. Enable this in the git.c but have its own fuse in the helper code by having a flag to turn on the super prefix. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 31

[PATCHv2 1/4] submodule: use absolute path for computing relative path connecting

The current caller of connect_work_tree_and_git_dir passes an absolute path for the `git_dir` parameter. In the future patch we will also pass in relative path for `git_dir`. Extend the functionality of connect_work_tree_and_git_dir to take relative paths for parameters. We could work around this

[PATCHv2 0/4] `submodule embedgitdirs` [was: Introduce `submodule interngitdirs`]

v2: * fixed commit message for patch: "submodule: use absolute path for computing relative path connecting" * a new patch "submodule helper: support super prefix" * redid the final patch with more tests and fixing bugs along the way * "test-lib-functions.sh: teach test_commit -C " unchanged diff

Re: [PATCH] git-gui: pass the branch name to git merge

Johannes Sixt writes: > The recent rewrite of the 'git merge' invocation in b5f325cb > (git-gui: stop using deprecated merge syntax) replaced the > subsidiary call of 'git fmt-merge-msg' to take advantage of > the capability of 'git merge' that can construct a merge log > message

Re: [PATCH 2/3] stripspace: respect repository config

Junio C Hamano writes: > I think we want to audit the ones without RUN_SETUP* in the command > table in order to hunt for regression aka "a fix revealed a bug that > was covered by .git/config accidentally getting read when run from > the top-level of the working tree",

[PATCH v5 4/6] grep: optionally recurse into submodules

Allow grep to recognize submodules and recursively search for patterns in each submodule. This is done by forking off a process to recursively call grep on each submodule. The top level --super-prefix option is used to pass a path to the submodule which can in turn be used to prepend to output

[PATCH v5 6/6] grep: search history of moved submodules

If a submodule was renamed at any point since it's inception then if you were to try and grep on a commit prior to the submodule being moved, you wouldn't be able to find a working directory for the submodule since the path in the past is different from the current path. This patch teaches grep

[PATCH v5 5/6] grep: enable recurse-submodules to work on objects

Teach grep to recursively search in submodules when provided with a object. This allows grep to search a submodule based on the state of the submodule that is present in a commit of the super project. When grep is provided with a object, the name of the object is prefixed to all output. In

[PATCH v5 0/6] recursively grep across submodules

Major change in v5 is to use tree_is_interesting api instead of the vanilla pathspec code for submodules. This is to fix the issue in the last seires where I mix the two types. More tests were also added to ensure that the changes to the pathspec code functioned properly. Brandon Williams (6):

[PATCH v5 2/6] submodules: load gitmodules file from commit sha1

teach submodules to load a '.gitmodules' file from a commit sha1. This enables the population of the submodule_cache to be based on the state of the '.gitmodules' file from a particular commit. Signed-off-by: Brandon Williams --- cache.h| 2 ++ config.c

[PATCH v5 3/6] grep: add submodules as a grep source type

Add `GREP_SOURCE_SUBMODULE` as a grep_source type and cases for this new type in the various switch statements in grep.c. When initializing a grep_source with type `GREP_SOURCE_SUBMODULE` the identifier can either be NULL (to indicate that the working tree will be used) or a SHA1 (the REV of the

[PATCH v5 1/6] submodules: add helper functions to determine presence of submodules

Add two helper functions to submodules.c. `is_submodule_initialized()` checks if a submodule has been initialized at a given path and `is_submodule_populated()` check if a submodule has been checked out at a given path. Signed-off-by: Brandon Williams --- submodule.c | 38

Re: [PATCHv3 3/3] submodule-config: clarify parsing of null_sha1 element

On 11/21, Junio C Hamano wrote: > Stefan Beller writes: > > > +Whenever a submodule configuration is parsed in > > `parse_submodule_config_option` > > +via e.g. `gitmodules_config()`, it will be overwrite the null_sha1 entry. > > It will overwrite? It will be overwritten?

Re: [PATCH v7 13/17] ref-filter: add `:dir` and `:base` options for ref printing atoms

On Sun, Nov 20, 2016 at 11:02 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> We could have lstrip and rstrip as you suggested and perhaps make it work >> together too. But I see this going off the scope of this series. Maybe >> I'll follow up >>

Re: [PATCH v7 14/17] ref-filter: allow porcelain to translate messages in the output

On Mon, Nov 21, 2016 at 2:11 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> cc'in Matthieu since he wrote the patch. >> >> On Sat, Nov 19, 2016 at 4:16 AM, Jakub Narębski wrote: >>> W dniu 08.11.2016 o 21:12, Karthik

Re: [PATCH v7 16/17] branch: use ref-filter printing APIs

On Fri, Nov 18, 2016 at 3:35 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> One worry that I have is if the strings embedded in this function to >> the final format are safe. As far as I can tell, the pieces of >> strings that are literally

Re: [PATCH v2 2/2] push: fix --dry-run to not push submodules

On 11/22, Junio C Hamano wrote: > Brandon Williams writes: > > > On 11/17, Stefan Beller wrote: > >> On Thu, Nov 17, 2016 at 10:46 AM, Brandon Williams > >> wrote: > >> > >> > sha1_array_clear(); > >> > -

Re: Fwd: git diff with “--word-diff-regex” extremely slow compared to “--word-diff”?

Thanks Jeff for the answer! You are right, I should have compared with the same regex, and indeed, --word-diff-regex=[^[:space:]] is also much slower than just --word-diff, although they do the same job. Maybe this is a hint that the --word-diff-regex code could be made faster? I have a small

Re: v2.11 new diff heuristic?

On Tue, Nov 22, 2016 at 08:42:36AM -0600, Robert Dailey wrote: > I dug into the git diff documentation here: > > https://git-scm.com/docs/git-diff > > It mentions a "--compaction-heuristic" option. Is this the new > heuristic outlined by the release notes? If not, which is it? No. The docs on

Re: [PATCH 3/3] submodule--helper: add intern-git-dir function

Stefan Beller writes: > On Mon, Nov 21, 2016 at 11:07 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> So I guess we should test a bit more extensively, maybe >>> >>> git status >expect >>> git submodule embedgitdirs

[PATCH] git-gui: pass the branch name to git merge

The recent rewrite of the 'git merge' invocation in b5f325cb (git-gui: stop using deprecated merge syntax) replaced the subsidiary call of 'git fmt-merge-msg' to take advantage of the capability of 'git merge' that can construct a merge log message when the rev being merged is FETCH_HEAD. A

Re: v2.11 new diff heuristic?

On Tue, Nov 22, 2016 at 6:42 AM, Robert Dailey wrote: > The release notes mention a new heuristic for diff: > > * Output from "git diff" can be made easier to read by selecting > which lines are common and which lines are added/deleted > intelligently when the lines

Re: [PATCH] merge-recursive.c: use QSORT macro

On Tue, Nov 22, 2016 at 07:30:19PM +0700, Nguyễn Thái Ngọc Duy wrote: > This is the follow up of rs/qsort series, merged in b8688ad (Merge > branch 'rs/qsort' - 2016-10-10), where coccinelle was used to do > automatic transformation. > > Signed-off-by: Nguyễn Thái Ngọc Duy >

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

Vasco Almeida writes: > A Sex, 11-11-2016 às 11:45 -0100, Vasco Almeida escreveu: >> +=item comment_lines ( STRING [, STRING... ]) >> + >> +Comments lines following core.commentchar configuration. >> + >> +=cut >> + >> +sub comment_lines { >> +   my $comment_line_char

Re: [PATCH v2 2/2] push: fix --dry-run to not push submodules

Brandon Williams writes: > On 11/17, Stefan Beller wrote: >> On Thu, Nov 17, 2016 at 10:46 AM, Brandon Williams wrote: >> >> > sha1_array_clear(); >> > - die("Failed to push all needed >> >

Re: [PATCH 31/35] pathspec: allow querying for attributes

On Tue, Nov 22, 2016 at 2:41 AM, Duy Nguyen wrote: > On Fri, Nov 11, 2016 at 3:34 AM, Stefan Beller wrote: >> @@ -139,7 +140,8 @@ static size_t common_prefix_len(const struct pathspec >> *pathspec) >>PATHSPEC_LITERAL | >>

Re: [PATCH 1/3] rebase -i: highlight problems with core.commentchar

Johannes Schindelin writes: > On Mon, 21 Nov 2016, Junio C Hamano wrote: > >> diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh >> index 29e91d861c..c1f6411eb2 100755 >> --- a/t/t0030-stripspace.sh >> +++ b/t/t0030-stripspace.sh >> @@ -432,6 +432,15 @@

Re: v2.11 new diff heuristic?

On November 22, 2016 6:42:36 AM PST, Robert Dailey wrote: >The release notes mention a new heuristic for diff: > >* Output from "git diff" can be made easier to read by selecting >which lines are common and which lines are added/deleted >intelligently when the lines

Re: [PATCH 3/3] submodule--helper: add intern-git-dir function

On Mon, Nov 21, 2016 at 11:07 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> So I guess we should test a bit more extensively, maybe >> >> git status >expect >> git submodule embedgitdirs >> git status >actual >> test_cmp expect

Re: [PATCH 2/3] stripspace: respect repository config

Johannes Schindelin writes: >> This conditional config file reading is a trap for similar bugs to >> happen again. Is there any reason we should not just mark the command >> RUN_SETUP_GENTLY in git.c and call git_config() here unconditionally? > > As I plan to slip

[PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

The popular difftool command was just converted into a builtin, for better performance on Windows as well as to reduce the number of Perl scripts (so that we may, in the very long run, be able to ship Git for Windows without any Perl interpreter at all). However, it would be sloppy practice to

[PATCH 0/2] Show Git Mailing List: a builtin difftool

I have been working on the builtin difftool for a little over a week, for two reasons: 1. Perl is really not native on Windows. Not only is there a performance penalty to be paid just for running Perl scripts, we also have to deal with the fact that users may have different Perl

[PATCH 1/2] difftool: add the builtin

This adds a builtin difftool that represents a conversion of the current Perl script version of the difftool. The motivation is that Perl scripts are not at all native on Windows, and that `git difftool` therefore is pretty slow on that platform, when there is no good reason for it to be slow.

Re: [PATCH 2/3] stripspace: respect repository config

Hi Duy, On Tue, 22 Nov 2016, Duy Nguyen wrote: > On Mon, Nov 21, 2016 at 9:18 PM, Johannes Schindelin > wrote: > > When eff80a9 (Allow custom "comment char", 2013-01-16) taught the > > `stripspace` command to respect the config setting `core.commentChar`, > > it

Re: [PATCH 2/3] stripspace: respect repository config

Hi Junio, On Mon, 21 Nov 2016, Junio C Hamano wrote: > From: Johannes Schindelin > > The way "git stripspace" reads the configuration was not quite > correct, in that it forgot to probe for a possibly existing > repository (note: stripspace is designed to be usable

Re: [PATCH 1/3] rebase -i: highlight problems with core.commentchar

Hi Junio, On Mon, 21 Nov 2016, Junio C Hamano wrote: > diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh > index 29e91d861c..c1f6411eb2 100755 > --- a/t/t0030-stripspace.sh > +++ b/t/t0030-stripspace.sh > @@ -432,6 +432,15 @@ test_expect_success '-c with changed comment char' ' >

Re: [PATCH 1/3] rebase -i: identify problems with core.commentchar

Hi Junio, On Mon, 21 Nov 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh > > index 29e91d8..202ac07 100755 > > --- a/t/t0030-stripspace.sh > > +++ b/t/t0030-stripspace.sh > > @@ -432,6

Re: [PATCH 3/3] rebase -i: handle core.commentChar=auto

Hi Hannes, On Mon, 21 Nov 2016, Johannes Sixt wrote: > Am 21.11.2016 um 15:18 schrieb Johannes Schindelin: > > -comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) > > -: ${comment_char:=#} > > +comment_char=$(git config --get core.commentchar 2>/dev/null) > > +case

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

Git 2.11.0-rc2 introduced a very small l10n update. Because the update windows will be closed tomorrow, I made a batch updates. See commit: * https://github.com/git-l10n/git-po/commit/275588f93 I have a reduced diff for this commit using a custom diff driver, see: *

[GIT PULL] l10n updates for 2.11.0 round 2

Hi Junio, The following changes since commit 1310affe024fba407bff55dbe65cd6d670c8a32d: Git 2.11-rc2 (2016-11-17 13:47:36 -0800) are available in the git repository at: git://github.com/git-l10n/git-po tags/l10n-2.11.0-rnd2 for you to fetch changes up to

v2.11 new diff heuristic?

The release notes mention a new heuristic for diff: * Output from "git diff" can be made easier to read by selecting which lines are common and which lines are added/deleted intelligently when the lines before and after the changed section are the same. A command line option is added to help with

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

A Sex, 11-11-2016 às 11:45 -0100, Vasco Almeida escreveu: > +=item comment_lines ( STRING [, STRING... ]) > + > +Comments lines following core.commentchar configuration. > + > +=cut > + > +sub comment_lines { > +   my $comment_line_char = config("core.commentchar") || '#'; > +   return

Re: [PATCH v1 12/19] Documentation/config: add splitIndex.maxPercentChange

On Tue, Nov 22, 2016 at 8:13 PM, Christian Couder wrote: > So if we now mix things up just to avoid one more configuration > option, we could very well make things harder to develop, to > configure, to parse and to understand later, so it is not a trade off > worth

Re: [PATCH v1 12/19] Documentation/config: add splitIndex.maxPercentChange

On Tue, Nov 22, 2016 at 11:35 AM, Duy Nguyen wrote: [...] >>> In my opinion, "true" _is_ auto, which is a way to say "I trust you to >>> do the right thing, just re-split the index when it makes sense", "no" >>> is disabled of course. If the user wants to be specific, just

[PATCH] merge-recursive.c: use QSORT macro

This is the follow up of rs/qsort series, merged in b8688ad (Merge branch 'rs/qsort' - 2016-10-10), where coccinelle was used to do automatic transformation. Signed-off-by: Nguyễn Thái Ngọc Duy --- coccinelle missed this place, understandably, because it can't know that

Re: [PATCH 31/35] pathspec: allow querying for attributes

On Fri, Nov 11, 2016 at 3:34 AM, Stefan Beller wrote: > @@ -139,7 +140,8 @@ static size_t common_prefix_len(const struct pathspec > *pathspec) >PATHSPEC_LITERAL | >PATHSPEC_GLOB | >PATHSPEC_ICASE | > -

Re: [PATCH v1 12/19] Documentation/config: add splitIndex.maxPercentChange

On Fri, Nov 18, 2016 at 9:34 PM, Christian Couder wrote: > On Mon, Nov 7, 2016 at 10:38 AM, Duy Nguyen wrote: >> (sorry I got sick in the last few weeks and could not respond to this >> earlier) > > (Yeah, I have also been sick during the last few

Re: [PATCH 3/3] rebase -i: handle core.commentChar=auto

On Mon, Nov 21, 2016 at 9:18 PM, Johannes Schindelin wrote: > When 84c9dc2 (commit: allow core.commentChar=auto for character auto > selection, 2014-05-17) extended the core.commentChar functionality to > allow for the value 'auto', it forgot that rebase -i was already

Re: [PATCH 2/3] stripspace: respect repository config

On Mon, Nov 21, 2016 at 9:18 PM, Johannes Schindelin wrote: > When eff80a9 (Allow custom "comment char", 2013-01-16) taught the > `stripspace` command to respect the config setting `core.commentChar`, > it forgot that this variable may be defined in .git/config. > > So

[PATCH 3/3] worktree list: keep the list sorted

It makes it easier to write tests for. But it should also be good for the user since locating a worktree by eye would be easier once they notice this. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 18 +- 1 file changed, 17 insertions(+), 1

[PATCH 1/3] worktree.c: zero new 'struct worktree' on allocation

This keeps things a bit simpler when we add more fields, knowing that default values are always zero. Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/worktree.c b/worktree.c index

[PATCH 0/3] Minor fixes on 'git worktree'

This fixes two things: - make sure the first item is always the main worktree even if we fail to retrieve some info - keep 'worktree list' order stable (which in turn fixes the random failure on my 'worktree-move' series Nguyễn Thái Ngọc Duy (3): worktree.c: zero new 'struct worktree'

[PATCH 2/3] get_worktrees() must return main worktree as first item even on error

This is required by git-worktree.txt, stating that the main worktree is the first line (especially in --porcelain mode when we can't just change behavior at will). There's only one case when get_worktrees() may skip main worktree, when parse_ref() fails. Update the code so that we keep first item