[PATCH v5 6/6] add worktree.guessRemote config option

-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Documentation/config.txt | 10 ++ Documentation/git-worktree.txt | 3 +++ builtin/worktree.c | 14 +- t/t2025-worktree-add.sh| 31 +++ 4 files changed, 57 insertions

[PATCH v5 4/6] worktree: make add dwim

. create a new branch from the remote tracking branch and set the upstream to the remote tracking branch. As 'git worktree add' currently just dies in this situation, there are no backwards compatibility worries when introducing this feature. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.

[PATCH v5 5/6] worktree: add --guess-remote flag to add subcommand

i.e. check if the new branch name uniquely matches the branch name of a remote-tracking branch, and if so check out that branch and set the upstream to the remote-tracking branch. Add a new --guess-remote option that enables exactly that behaviour. Signed-off-by: Thomas Gummerer <t.gumme

[PATCH v4 3/4] worktree: make add dwim

, i.e. create a new branch from the remote tracking branch and set the upstream to the remote tracking branch. As 'git worktree add' currently just dies in this situation, there are no backwards compatibility worries when introducing this feature. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.

[PATCH v4 4/4] worktree: make add dwim

es the new behaviour, and keeps the old behaviour of creating a new branch from the head of the current worktree. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Documentation/git-worktree.txt | 14 -- builtin/worktree.c | 7 +++ t/t2025-worktree-ad

[PATCH v4 1/4] checkout: factor out functions to new lib file

Factor the functions out, so they can be re-used from other places. In particular these functions will be re-used in builtin/worktree.c to make git worktree add dwim more. While there add some docs to the function. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Ma

[PATCH v4 0/4] make git worktree add dwim more

add sets up tracking' ' - test_when_finished rm -rf repo_a && - test_when_finished rm -rf repo_b && - test_when_finished rm -rf foo && - git init repo_a && - ( - cd repo_a && - test_commit a_master &

[PATCH v4 2/4] worktree: add --[no-]track option to the add subcommand

branch'. We already respect branch.autoSetupMerge, as 'git worktree' just calls 'git branch' internally. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Documentation/git-worktree.txt | 6 + builtin/worktree.c | 8 ++ t/t2025-worktree-add.sh

Re: [PATCH] checkout: include the checkout.h header file

On 11/24, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Thomas, > > If you need to re-roll your 'tg/worktree-create-tracking' branch, could > you please squash this into the relevant patch (commit 6736ae9593, > "checkout: factor out functions to

Re: [PATCH v3 3/3] worktree: make add dwim

On 11/22, Junio C Hamano wrote: > Thomas Gummerer <t.gumme...@gmail.com> writes: > > > I didn't consider that, I think you are right, and the flag should > > apply in that case as well. I think at that point we may as well pass > > this flag through to the 'git bran

[PATCH v6 0/6] make git worktree add dwim more

_options(worktree_usage, options); Thomas Gummerer (6): checkout: factor out functions to new lib file worktree: add can be created from any commit-ish worktree: add --[no-]track option to the add subcommand worktree: make add dwim worktree: add --guess-remote flag to add subcommand a

[PATCH v6 5/6] worktree: add --guess-remote flag to add subcommand

i.e. check if the new branch name, derived from the basename of the , uniquely matches the branch name of a remote-tracking branch, and if so check out that branch and set the upstream to the remote-tracking branch. Add a new --guess-remote option that enables exactly that behaviour. Signed-off-by: Thoma

[PATCH v6 6/6] add worktree.guessRemote config option

-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Documentation/config.txt | 10 ++ Documentation/git-worktree.txt | 3 +++ builtin/worktree.c | 14 -- t/t2025-worktree-add.sh| 31 +++ 4 files changed, 56 insertions

[PATCH v6 4/6] worktree: make add dwim

. create a new branch from the remote tracking branch and set the upstream to the remote tracking branch. As 'git worktree add' currently just dies in this situation, there are no backwards compatibility worries when introducing this feature. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.

[PATCH v6 3/6] worktree: add --[no-]track option to the add subcommand

branch'. We already respect branch.autoSetupMerge, as 'git worktree' just calls 'git branch' internally. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Documentation/git-worktree.txt | 6 + builtin/worktree.c | 8 +++ t/t2025-worktree-add.sh

[PATCH v6 2/6] worktree: add can be created from any commit-ish

of git worktree add might find it helpful. Reported-by: Randall S. Becker <rsbec...@nexbridge.com> Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Documentation/git-worktree.txt | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Docum

[PATCH v6 1/6] checkout: factor out functions to new lib file

Factor the functions out, so they can be re-used from other places. In particular these functions will be re-used in builtin/worktree.c to make git worktree add dwim more. While there add some docs to the function. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Ma

Re: Apparent bug in 'git stash push ' loses untracked files

On 12/16, Junio C Hamano wrote: > Thomas Gummerer <t.gumme...@gmail.com> writes: > > > Maybe the best solution would be to introduce 'git reset --hard -- > > ', or maybe someone who knows shell programming a little > > better than me has an idea? > > > >

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 12/12, Junio C Hamano wrote: > Lars Schneider writes: > > >> You're right, it's my first time using travis CI and I got confused > >> about how the .travis.yml works, thanks for catching that. Will > >> re-phrase the commit message. > > > > Szeder is spot on. If you

Re: [PATCH v2 1/3] repository: fix repo_read_index with submodules

On 12/18, Brandon Williams wrote: > On 12/17, Thomas Gummerer wrote: > > repo_read_index calls read_index_from, which takes an path argument for > > the location of the index file. For the split index however it relies > > > on the current working directory to construct

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 12/13, Lars Schneider wrote: > > > On 13 Dec 2017, at 18:38, Junio C Hamano wrote: > > > > Lars Schneider writes: > > > >> I think your solution points into the right direction. > >> Right now we have the following test matrix: > >> > >> 1.

Re: Apparent bug in 'git stash push ' loses untracked files

On 12/13, Igor Djordjevic wrote: > Hi Reid, > > On 13/12/2017 18:32, Reid Price wrote: > > > > When running 'git stash push ' if there are both tracked and > > untracked files in this subdirectory, the tracked files are stashed > > but the untracked files are discarded. > > I can reproduce this

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 12/12, Junio C Hamano wrote: > Thomas Gummerer <t.gumme...@gmail.com> writes: > > > > > The breakages wen the split-index code fails tend to break things in > > much more obvious manners than a wrong message, usually git ends up > > dying if it gets broke

[PATCH v2 0/3] fixes for split index mode

n.c index 9d8d9b96d1..34e1e4b799 100644 --- a/revision.c +++ b/revision.c @@ -1358,6 +1358,7 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags) if (repo_read_index(repo) > 0) do_add_index_objects_to_pending(revs, repo->

[PATCH v2 2/3] prune: fix pruning with multiple worktrees and split index

the proper paths for the worktree. This fixes t5304-prune when ran with GIT_TEST_SPLIT_INDEX set. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- repository.c | 11 +++ repository.h | 2 ++ revision.c | 14 +- 3 files changed, 22 insertions(+), 5 deletion

[PATCH v2 1/3] repository: fix repo_read_index with submodules

tive would have been to make the callers pass in the base path for the split index, however that ended up being more complicated, and I think we want to converge towards using struct repository for things like these anyway. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- cache.h

[PATCH v2 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

unio C Hamano <gits...@pobox.com> Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- ci/run-linux32-build.sh | 1 + ci/run-tests.sh | 4 2 files changed, 5 insertions(+) diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index e30fb2cddc..f173c9cf2a 100755 --

Re: Apparent bug in 'git stash push ' loses untracked files

Hi, On 12/13, Reid Price wrote: > When running 'git stash push ' if there are both tracked and > untracked files in this subdirectory, the tracked files are stashed > but the untracked files are discarded. > > I can reproduce this on my system (OSX, git 2.14.1) by running the > below script as >

[PATCH v1 2/2] worktree: make add dwim

ly matches the branch name of a remote tracking branch, and if so check out that branch, and set the upstream to the remote tracking branch. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- I'm a bit torn about hiding his behind an additional flag in git worktree add or not. I wo

[PATCH v1 1/2] checkout: factor out functions to new lib file

Factor the functions out, so they can be re-used from other places. In particular these functions will be re-used in builtin/worktree.c to make git worktree add dwim more. While there add a description to the function. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- I'm no

Re: [PATCH 2/2] stash: implement builtin stash helper

On 11/10, Joel Teichroeb wrote: > Start moving stash functions over to builtin c code and call > them in the shell script, instead of converting it all at > once. > > Signed-off-by: Joel Teichroeb > --- Thanks for working on this! I like the approach of converting this one

Re: [PATCH v1 1/2] checkout: factor out functions to new lib file

On 11/13, Junio C Hamano wrote: > Thomas Gummerer <t.gumme...@gmail.com> writes: > > > Factor the functions out, so they can be re-used from other places. In > > particular these functions will be re-used in builtin/worktree.c to make > > git worktree add dwim

Re: [PATCH v1 2/2] worktree: make add dwim

On 11/13, Junio C Hamano wrote: > Thomas Gummerer <t.gumme...@gmail.com> writes: > > > I'm a bit torn about hiding his behind an additional flag in git > > worktree add or not. I would like to have the feature without the > > additional flag, but it might break

Re: [PATCH v1 2/2] worktree: make add dwim

On 11/15, Thomas Gummerer wrote: > On 11/14, Eric Sunshine wrote: > > On Tue, Nov 14, 2017 at 3:14 PM, Eric Sunshine <sunsh...@sunshineco.com> > > wrote: > > > For my own edification... > > > [...] > > > git worktree add ../topic > > > >

Re: [PATCH v2 2/3] worktree: make add dwim

On 11/18, Thomas Gummerer wrote: > Currently 'git worktree add ', errors out when 'branch' > is not a local branch. It has no additional dwim'ing features that one > might expect. > > Make it behave more like 'git checkout ' when the branch doesn't > exist locally, but a remo

[PATCH v3 0/3] make git worktree add dwim more

tream/*" && git fetch --all && + test_must_fail git worktree add -b foo ../foo foo && + test_must_fail git worktree add --detach ../foo foo && git worktree add ../foo foo ) &&

[PATCH v3 3/3] worktree: make add dwim

es the new behaviour, and keeps the old behaviour of creating a new branch from the head of the current worktree. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Documentation/git-worktree.txt | 15 --- builtin/worktree.c | 9 +++ t/t2025-worktree-ad

[PATCH v3 2/3] worktree: make add dwim

, i.e. create a new branch from the remote tracking branch and set the upstream to the remote tracking branch. As 'git worktree add' currently just dies in this situation, there are no backwards compatibility worries when introducing this feature. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.

[PATCH v3 1/3] checkout: factor out functions to new lib file

Factor the functions out, so they can be re-used from other places. In particular these functions will be re-used in builtin/worktree.c to make git worktree add dwim more. While there add some docs to the function. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- Ma

Re: [PATCH v3 2/3] worktree: make add dwim

On 11/19, Eric Sunshine wrote: > On Sat, Nov 18, 2017 at 5:47 PM, Thomas Gummerer <t.gumme...@gmail.com> wrote: > > Currently 'git worktree add ', errors out when 'branch' > > is not a local branch. It has no additional dwim'ing features that one > > might expect.

[PATCH v2 2/3] worktree: make add dwim

, i.e. create a new branch from the remote tracking branch and set the upstream to the remote tracking branch. As 'git worktree add' currently just dies in this situation, there are no backwards compatibility worries when introducing this feature. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.

[PATCH v2 1/3] checkout: factor out functions to new lib file

Factor the functions out, so they can be re-used from other places. In particular these functions will be re-used in builtin/worktree.c to make git worktree add dwim more. While there add some docs to the function. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- The previous

[PATCH v2 3/3] worktree: make add dwim

es the new behaviour, and keeps the old behaviour of creating a new branch from the head of the current worktree. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- I went back and forth between hiding this behing a flag, and making it default and having a flag for getting the old behaviour b

Re: [PATCH v3 3/3] worktree: make add dwim

On 11/19, Eric Sunshine wrote: > On Sun, Nov 19, 2017 at 2:04 PM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: > > On Sat, Nov 18, 2017 at 5:47 PM, Thomas Gummerer <t.gumme...@gmail.com> > > wrote: > >> +To disable the behaviour of trying to m

Re: [PATCH v2 3/9] ref_transaction_update(): die on disallowed flags

On 11/07, Martin Ågren wrote: > On 5 November 2017 at 09:42, Michael Haggerty wrote: > > Callers shouldn't be passing disallowed flags into > > `ref_transaction_update()`. So instead of masking them off, treat it > > as a bug if any are set. > > > > Signed-off-by: Michael

Git Open Source Weekend London 11th/12th November

Hi, Bloomberg is hosting an Open Source Weekend in London on the 11th & 12th November 2017 to contribute to the Git project. We have also confirmed that Peff will be amongst the mentors on hand to guide attendees through their efforts! Some of you may notice that we tried to organize this

Re: How to begin an error/die string? Upper- or lower-case letter?

On Mon, Dec 11, 2017 at 10:23 AM, Lars Schneider wrote: > Hi, > > error() and die() messages seems to begin with upper-case and > lower-case letters in the Git code base: > > git grep 'error(_' | perl -nE 'say /.*error\(_\("(.).*/' | sort | uniq -c > git grep 'die(_'

Re: [PATCH 1/3] repository: fix repo_read_index with submodules

On 12/11, Brandon Williams wrote: > On 12/10, Thomas Gummerer wrote: > > repo_read_index calls read_index_from, which takes an path argument for > > the location of the index file. For the split index however it relies > > on the current working directory to construct th

Re: [PATCH 2/3] prune: fix pruning with multiple worktrees and split index

On 12/11, Brandon Williams wrote: > On 12/10, Thomas Gummerer wrote: > > be489d02d2 ("revision.c: --indexed-objects add objects from all > > worktrees", 2017-08-23) made sure that pruning takes objects from all > > worktrees into account. > > > > It did

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

use additional cycles on travis and would not bring that > > much benefit, as we are still running the test suite in the "vanilla" > > version in the 32-bit mode. > > > > Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> > > --- > > .travis.y

[PATCH 2/3] prune: fix pruning with multiple worktrees and split index

the proper paths for the worktree. This fixes t5304-prune when ran with GIT_TEST_SPLIT_INDEX set. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- This also fixes t7009 when ran with GIT_TEST_SPLIT_INDEX. I'm not quite sure why it is fixed by this. Either way I tracked the failure do

[PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

only use additional cycles on travis and would not bring that much benefit, as we are still running the test suite in the "vanilla" version in the 32-bit mode. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletio

[PATCH 0/3] fixes for split index mode

t7814-grep-recurse-submodules.sh (Wstat: 256 Tests: 22 Failed: 13) Failed tests: 2-3, 5-10, 12-15, 22 Non-zero exit status: 1 This series fixes these and makes travis run the test suite with GIT_TEST_SPLIT_INDEX to avoid similar breakages in the future. Thomas Gummerer (3):

[PATCH 1/3] repository: fix repo_read_index with submodules

tive would have been to make the callers pass in the base path for the split index, however that ended up being more complicated, and I think we want to converge towards using struct repository for things like these anyway. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- cache.h

Re: [PATCH v1 1/2] t/README: remove mention of adding copyright notices

On 12/05, Jonathan Nieder wrote: > Hi, > > Thomas Gummerer wrote: > > > We generally no longer include copyright notices in new test scripts. > > However t/README still mentions it as something to include at the top of > > every new script. > > Whe

Re: [PATCH v9 0/4] worktree: teach "add" to check out existing branches

On 04/27, Eric Sunshine wrote: > On Tue, Apr 24, 2018 at 5:56 PM, Thomas Gummerer <t.gumme...@gmail.com> wrote: > > Thanks Eric for the review and the suggestions on the previous round. > > > > Changes since the previous round: > > > > - UNLEAK new_bran

Re: [PATCH 07/11] rerere: use repo_read_index_or_die

On 05/16, Stefan Beller wrote: > By switching to repo_read_index_or_die, we'll get a slightly different > error message ("index file corrupt") as well as localization of it. Apart from the slightly different error message, and the localization (both of which I think are a good thing), I notice

[RFC/PATCH 3/7] rerere: add some documentation

Add some documentation for the logic behind the conflict normalization in rerere. Also describe a bug that happens because we just linearly scan for conflict markers. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- This documents my understanding of the rerere conflict normali

[RFC/PATCH 2/7] rerere: mark strings for translation

'git rerere' is considered a plumbing command and as such its output should be translated. Its functionality is also only enabled through a config setting, so scripts really shouldn't rely on its output either way. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- rerere.

[RFC/PATCH 0/7] rerere: handle nested conflicts

is marked as RFC/PATCH, as this is my first time touching the rerere code, so I may well misunderstand some bits of the code. Thomas Gummerer (7): rerere: unify error message when read_cache fails rerere: mark strings for translation rerere: add some documentation rerere: fix crash when

[RFC/PATCH 7/7] rerere: teach rerere to handle nested conflicts

<<< 2 === 3 >>>>>>>) Stripping out vs. leaving the conflict markers in place should have no practical impact, but it simplifies the implementation. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- No automated test for this ye

[RFC/PATCH 5/7] rerere: only return whether a path has conflicts or not

. This will simplify the code in the subsequent steps. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- rerere.c | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/rerere.c b/rerere.c index 49ace8e108..f3e658e374 100644 --- a/rerere.c +++ b/re

[RFC/PATCH 6/7] rerere: factor out handle_conflict function

Factor out the handle_conflict function, which handles a single conflict in a path. This is a preparation for the next step, where this function will be re-used. No functional changes intended. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- rerere.c

[RFC/PATCH 4/7] rerere: fix crash when conflict goes unresolved

will be regenerated by git if necessary, so the user won't loose any work. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- I realize the test here may not be as complete as we would want it to be. But I first wanted to get some feedback on the approach, before spending too muc

[RFC/PATCH 1/7] rerere: unify error message when read_cache fails

se that here as well. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- "index file corrupt" is also what Stefan chose for his series unifying these error messages (and 'die'ing, which I'm not sure is the right thing to do here as also mentioned in my reply to [1]). I'm h

Re: [RFC/PATCH 7/7] rerere: teach rerere to handle nested conflicts

On 05/24, Junio C Hamano wrote: > Thomas Gummerer <t.gumme...@gmail.com> writes: > > > No automated test for this yet. As mentioned in the cover letter as > > well, I'm not sure if this is common enough for us to actually > > consider this use case. I don't k

Re: [RFC/PATCH 4/7] rerere: fix crash when conflict goes unresolved

On 05/24, Junio C Hamano wrote: > Thomas Gummerer <t.gumme...@gmail.com> writes: > > > To fix this, remove the rerere ID from the MERGE_RR file in case we > > can't handle it, and remove the folder for the ID. Removing it > > unconditionally is fine here, because i

Re: [PATCH 2/1] SubmittingPatches: not git-secur...@googlegroups.com

On 05/29, Thomas Gummerer wrote: > On 05/28, Junio C Hamano wrote: > > Thomas Gummerer writes: > > > > > Yeah sorry, that's what I meant. > > > https://public-inbox.org/git/20180308150820.22588-1-ava...@gmail.com/ > > > is the reference I meant to put t

Re: [PATCH 2/1] SubmittingPatches: not git-secur...@googlegroups.com

On 05/28, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Yeah sorry, that's what I meant. > > https://public-inbox.org/git/20180308150820.22588-1-ava...@gmail.com/ > > is the reference I meant to put there. > > > > How about something like the

[PATCH v2 1/2] SubmittingPatches: replace numbered attributes with names

a footnote earlier in the document. In addition it also clarifies that the attribute name/number is not related to the number the footnote will get in the output. Signed-off-by: Thomas Gummerer --- Thanks Junio, Jonathan and brian for the comments on the previous round at <20180527140433.3227

[PATCH v2 2/2] note git-secur...@googlegroups.com in more places

contribute (SubmittingPatches) may be the first place to look. Use the same wording as we already have on the git-scm.com website and in the man page for the README, while the wording is adjusted in SubmittingPatches to match the surrounding document better. Signed-off-by: Thomas Gummerer --- Doc

[PATCH] README: note git-secur...@googlegroups.com

e the same wording as we already have on the git-scm.com website and in the man page. Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- 2caa7b8d27 ("git manpage: note git-secur...@googlegroups.com", 2018-03-08) also mentions SubmittingPatches, but I think people are much more

[PATCH 2/1] SubmittingPatches: not git-secur...@googlegroups.com

On 05/27, Jonathan Nieder wrote: > Thomas Gummerer wrote: > > > Add a mention of the security mailing list to the README. > > 2caa7b8d27 ("git manpage: note git-secur...@googlegroups.com", > > 2018-03-08) already added it to the man page, but I suspect that for &

Re: why do "git log -h" and "git show -h" print the same thing?

On 05/24, Stefan Beller wrote: > On Thu, May 24, 2018 at 6:37 AM, Robert P. J. Day > wrote: > > > > maybe this is deliberate, but it's confusing that, with git 2.17.0, > > the output of both "git log -h" and "git show -h" is exactly the same: > > > > $ git log -h > >

Re: [PATCH v2 2/2] note git-secur...@googlegroups.com in more places

On 05/30, brian m. carlson wrote: > On Wed, May 30, 2018 at 09:52:55PM +0100, Thomas Gummerer wrote: > > Add a mention of the security mailing list to the README, and to > > Documentation/SubmittingPatches.. 2caa7b8d27 ("git manpage: note > > git-secur...@googlegroups

Re: [RFC/PATCH 3/7] rerere: add some documentation

On 05/24, Junio C Hamano wrote: > Thomas Gummerer writes: > > > +Conflict normalization > > +-- > > + > > +To try and re-do a conflict resolution, even when different merge > > +strategies are used, 'rerere' computes a conflict I

Re: [PATCH v2] t/perf/run: Use proper "--get-regexp", not "--get-regex"

> Subject: [PATCH v2] t/perf/run: Use proper "--get-regexp", not micronit: we prefer starting with a lowercase letter after the "area:" prefix in commit messages. Junio can probably fix that while queuing, so no need to resend. On 06/03, Robert P. J. Day wrote: > > Even though "--get-regex"

Re: [PATCH v4 9/9] checkout & worktree: introduce checkout.defaultRemote

On 05/31, Ævar Arnfjörð Bjarmason wrote: > Introduce a checkout.defaultRemote setting which can be used to > designate a remote to prefer (via checkout.defaultRemote=origin) when > running e.g. "git checkout master" to mean origin/master, even though > there's other remotes that have the "master"

Re: [PATCH v4 3/9] checkout.[ch]: move struct declaration into *.h

On 05/31, Ævar Arnfjörð Bjarmason wrote: > Move the tracking_name_data struct used in checkout.c into its > corresponding header file. This wasn't done in 7c85a87c54 ("checkout: > factor out functions to new lib file", 2017-11-26) when checkout.[ch] > were created, and is more consistent with the

Re: does a stash *need* any reference to the branch on which it was created?

69919bcc2452e8e2491ee31dbf647fc parent 9e457faad129f832ce0070dcfd1f4cfd3f322df3 author Thomas Gummerer 1527971565 +0100 committer Thomas Gummerer 1527971565 +0100 WIP on master: 4e5a9c0166 checkout & worktree: introduce checkout.defaultRemote The first parent here is the commit the stash is based on, so that's wh

[PATCH v2 00/10] rerere: handle nested conflicts

rences in those, they are probably best reviewed as the whole patch anyway: 1: 901b638400 ! 1: 2825342cc2 rerere: unify error message when read_cache fails @@ -1,6 +1,6 @@ Author: Thomas Gummerer -rerere: unify error message when read_cache fails +rerere: unify

[PATCH v2 10/10] rerere: recalculate conflict ID when unresolved conflict is committed

normalize the conflict before this patch series. Signed-off-by: Thomas Gummerer --- rerere.c | 7 +++ t/t4200-rerere.sh | 7 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/rerere.c b/rerere.c index f611db7873..644f185180 100644 --- a/rerere.c +++ b/rerere.c

[PATCH v2 02/10] rerere: lowercase error messages

Documentation/CodingGuidelines mentions that error messages should be lowercase. Prior to marking them for translation follow that pattern in rerere as well. Signed-off-by: Thomas Gummerer --- rerere.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git

[PATCH v2 06/10] rerere: fix crash when conflict goes unresolved

is the 'preimage', which by itself will be regenerated by git if necessary, so the user won't loose any work. Note that other variants that have the same conflict ID will not be touched. Signed-off-by: Thomas Gummerer --- rerere.c | 12 +++- t/t4200-rerere.sh | 22

[PATCH v2 09/10] rerere: teach rerere to handle nested conflicts

<<< 2 === 3 >>>>>>>) Stripping out vs. leaving the conflict markers in place should have no practical impact, but it simplifies the implementation. Signed-off-by: Thomas Gummerer --- I couldn't actually get the conflict markers the right way just using

[PATCH v2 04/10] rerere: mark strings for translation

'git rerere' is considered a plumbing command and as such its output should be translated. Its functionality is also only enabled through a config setting, so scripts really shouldn't rely on its output either way. Signed-off-by: Thomas Gummerer --- builtin/rerere.c | 4 +-- rerere.c

[PATCH v2 07/10] rerere: only return whether a path has conflicts or not

. This will simplify the code in the subsequent steps. Signed-off-by: Thomas Gummerer --- rerere.c | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/rerere.c b/rerere.c index 220020187b..da3744b86b 100644 --- a/rerere.c +++ b/rerere.c @@ -393,12 +393,13 @@ static

[PATCH v2 08/10] rerere: factor out handle_conflict function

Factor out the handle_conflict function, which handles a single conflict in a path. This is a preparation for the next step, where this function will be re-used. No functional changes intended. Signed-off-by: Thomas Gummerer --- rerere.c | 143

[PATCH v2 03/10] rerere: wrap paths in output in sq

for translators, when the strings are marked for translation in a subsequent commit. Signed-off-by: Thomas Gummerer --- builtin/rerere.c | 2 +- rerere.c | 26 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c

[PATCH v2 05/10] rerere: add some documentation

Add some documentation for the logic behind the conflict normalization in rerere. Helped-by: Junio C Hamano Signed-off-by: Thomas Gummerer --- Documentation/technical/rerere.txt | 142 + rerere.c | 4 - 2 files changed, 142 insertions

[PATCH v2 01/10] rerere: unify error messages when read_cache fails

se that here as well. Signed-off-by: Thomas Gummerer --- rerere.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rerere.c b/rerere.c index 18cae2d11c..4b4869662d 100644 --- a/rerere.c +++ b/rerere.c @@ -568,7 +568,7 @@ static int find_conflict(struct string_list *confli

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

On 10/26, Ramsay Jones wrote: > > > On 24/10/17 06:28, Junio C Hamano wrote: > [snip]> > > * tg/deprecate-stash-save (2017-10-23) 3 commits > > - stash: remove now superfluos help for "stash push" > > - mark git stash push deprecated in the man page > > - replace git stash save with git

Re: [PATCH v2 00/10] rerere: handle nested conflicts

On 06/05, Thomas Gummerer wrote: > The previous round was at > <20180520211210.1248-1-t.gumme...@gmail.com>. > > Thanks Junio for the comments on the previous round. > > Changes since v2: > - lowercase the first letter in some error/warning messages before >

Re: [PATCH v2 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 12/18, Lars Schneider wrote: > > > On 17 Dec 2017, at 23:51, Thomas Gummerer <t.gumme...@gmail.com> wrote: > > > > Split index mode only has a few dedicated tests, but as the index is > > involved in nearly every git operation, this doesn't quite cover all the

Re: [ANNOUNCE] Git v2.16.0-rc0

On 12/29, Paul Smith wrote: > On Thu, 2017-12-28 at 20:30 -0800, Junio C Hamano wrote: > > * The way "git worktree add" determines what branch to create from > >where and checkout in the new worktree has been updated a bit. > > Does this include the enhancements published a few weeks ago to

Re: Apparent bug in 'git stash push ' loses untracked files

On 12/18, Junio C Hamano wrote: > Thomas Gummerer <t.gumme...@gmail.com> writes: > > > Ah interesting, what you have below looks good to me indeed, it > > matches what I'd expect it to do and fixes the bug that was reported. > > Thanks! > > > > I've tak

Re: [PATCH v5 13/34] directory rename detection: tests for handling overwriting untracked files

On 01/04, Elijah Newren wrote: > On Wed, Jan 3, 2018 at 5:52 PM, SZEDER Gábor wrote: > > >> + test $(git rev-parse :0:y/b) = $(git rev-parse O:z/b) && > > > > There is a test helper for that :) > > > > test_cmp_rev :0:y/b O:z/b > > > > Note, that this is not

[PATCH v2] stash: don't delete untracked files that match pathspec

gmail.com> Helped-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- > Thanks, I'll fill in the gaps, and send a new patch, hopefully over > the weekend. Here it is :) Changes since the previous version: - handle binary files c

Re: [PATCH v2 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 01/04, Thomas Gummerer wrote: > On 12/18, Lars Schneider wrote: > > [snip] > > For now I think that looks good. Maybe we could define additional test > > configurations with an environment variable. That could be an array variable > > defined in the lib-travis.ci

[PATCH v3 1/3] read-cache: fix reading the shared index for other repos

ore control by using read_index_from(). Helped-by: Brandon Williams <bmw...@google.com> Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com> --- cache-tree.c | 2 +- cache.h | 5 +++-- read-cache.c | 23 +-- repository.c | 2 +- revision.c | 3 ++- 5 files changed

<    1   2   3   4   5   6   7   8   9   >