diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-08 12:41:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-09 01:24:19 (GMT) |
| commit | 4017761fd89060f2b57d7799f6bbda8b3568d3d4 (patch) | |
| tree | f9cc92a65c84f7ef05a25eb85d95f0fba19405cd /t | |
| parent | b24f56d60491416a1c5a8fc71863bbaa0f390f23 (diff) | |
| download | git-4017761fd89060f2b57d7799f6bbda8b3568d3d4.zip git-4017761fd89060f2b57d7799f6bbda8b3568d3d4.tar.gz git-4017761fd89060f2b57d7799f6bbda8b3568d3d4.tar.bz2 | |
branch.autosetupmerge: allow boolean values, or "all"
Junio noticed that switching on autosetupmerge unilaterally started
cluttering the config for local branches. That is not the original
intention of branch.autosetupmerge, which was meant purely for
convenience when branching off of remote branches, but that semantics
got lost somewhere.
If you still want that "new" behavior, you can switch
branch.autosetupmerge to the value "all". Otherwise, it is interpreted
as a boolean, which triggers setting up defaults _only_ when branching
off of a remote branch, i.e. the originally intended behavior.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3200-branch.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index c6f472a..a19e961 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -148,6 +148,15 @@ test_expect_success 'test tracking setup via config' \ test $(git config branch.my3.remote) = local && test $(git config branch.my3.merge) = refs/heads/master' +test_expect_success 'autosetupmerge = all' ' + git config branch.autosetupmerge true && + git branch all1 master && + test -z "$(git config branch.all1.merge)" && + git config branch.autosetupmerge all && + git branch all2 master && + test $(git config branch.all2.merge) = refs/heads/master +' + test_expect_success 'test overriding tracking setup via --no-track' \ 'git config branch.autosetupmerge true && git config remote.local.url . && |