Allow tracking branches to set up rebase by default.
Change cd67e4d4 introduced a new configuration parameter that told
pull to automatically perform a rebase instead of a merge. This
change provides a configuration option to enable this feature
automatically when creating a new branch.
If the variable branch.autosetuprebase applies for a branch that's
being created, that branch will have branch.<name>.rebase set to true.
Signed-off-by: Dustin Sallings <dustin@spy.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dustin Sallings
committed by
Junio C Hamano
Junio C Hamano
parent
d1a8d0ea5f
commit
c998ae9baa
@ -224,4 +224,238 @@ test_expect_success 'avoid ambiguous track' '
|
||||
test -z "$(git config branch.all1.merge)"
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase local on a tracked local branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
git config branch.autosetuprebase local &&
|
||||
(git show-ref -q refs/remotes/local/o || git-fetch local) &&
|
||||
git branch mybase &&
|
||||
git branch --track myr1 mybase &&
|
||||
test "$(git config branch.myr1.remote)" = . &&
|
||||
test "$(git config branch.myr1.merge)" = refs/heads/mybase &&
|
||||
test "$(git config branch.myr1.rebase)" = true
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase always on a tracked local branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
git config branch.autosetuprebase always &&
|
||||
(git show-ref -q refs/remotes/local/o || git-fetch local) &&
|
||||
git branch mybase2 &&
|
||||
git branch --track myr2 mybase &&
|
||||
test "$(git config branch.myr2.remote)" = . &&
|
||||
test "$(git config branch.myr2.merge)" = refs/heads/mybase &&
|
||||
test "$(git config branch.myr2.rebase)" = true
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase remote on a tracked local branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
git config branch.autosetuprebase remote &&
|
||||
(git show-ref -q refs/remotes/local/o || git-fetch local) &&
|
||||
git branch mybase3 &&
|
||||
git branch --track myr3 mybase2 &&
|
||||
test "$(git config branch.myr3.remote)" = . &&
|
||||
test "$(git config branch.myr3.merge)" = refs/heads/mybase2 &&
|
||||
! test "$(git config branch.myr3.rebase)" = true
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase never on a tracked local branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
git config branch.autosetuprebase never &&
|
||||
(git show-ref -q refs/remotes/local/o || git-fetch local) &&
|
||||
git branch mybase4 &&
|
||||
git branch --track myr4 mybase2 &&
|
||||
test "$(git config branch.myr4.remote)" = . &&
|
||||
test "$(git config branch.myr4.merge)" = refs/heads/mybase2 &&
|
||||
! test "$(git config branch.myr4.rebase)" = true
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase local on a tracked remote branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
git config branch.autosetuprebase local &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --track myr5 local/master &&
|
||||
test "$(git config branch.myr5.remote)" = local &&
|
||||
test "$(git config branch.myr5.merge)" = refs/heads/master &&
|
||||
! test "$(git config branch.myr5.rebase)" = true
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase never on a tracked remote branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
git config branch.autosetuprebase never &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --track myr6 local/master &&
|
||||
test "$(git config branch.myr6.remote)" = local &&
|
||||
test "$(git config branch.myr6.merge)" = refs/heads/master &&
|
||||
! test "$(git config branch.myr6.rebase)" = true
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase remote on a tracked remote branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
git config branch.autosetuprebase remote &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --track myr7 local/master &&
|
||||
test "$(git config branch.myr7.remote)" = local &&
|
||||
test "$(git config branch.myr7.merge)" = refs/heads/master &&
|
||||
test "$(git config branch.myr7.rebase)" = true
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase always on a tracked remote branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
git config branch.autosetuprebase remote &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --track myr8 local/master &&
|
||||
test "$(git config branch.myr8.remote)" = local &&
|
||||
test "$(git config branch.myr8.merge)" = refs/heads/master &&
|
||||
test "$(git config branch.myr8.rebase)" = true
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '
|
||||
git config --unset branch.autosetuprebase &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --track myr9 local/master &&
|
||||
test "$(git config branch.myr9.remote)" = local &&
|
||||
test "$(git config branch.myr9.merge)" = refs/heads/master &&
|
||||
test "z$(git config branch.myr9.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/o || git-fetch local) &&
|
||||
git branch mybase10 &&
|
||||
git branch --track myr10 mybase2 &&
|
||||
test "$(git config branch.myr10.remote)" = . &&
|
||||
test "$(git config branch.myr10.merge)" = refs/heads/mybase2 &&
|
||||
test "z$(git config branch.myr10.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr11 mybase2 &&
|
||||
test "z$(git config branch.myr11.remote)" = z &&
|
||||
test "z$(git config branch.myr11.merge)" = z &&
|
||||
test "z$(git config branch.myr11.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr12 local/master &&
|
||||
test "z$(git config branch.myr12.remote)" = z &&
|
||||
test "z$(git config branch.myr12.merge)" = z &&
|
||||
test "z$(git config branch.myr12.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase never on an untracked local branch' '
|
||||
git config branch.autosetuprebase never &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr13 mybase2 &&
|
||||
test "z$(git config branch.myr13.remote)" = z &&
|
||||
test "z$(git config branch.myr13.merge)" = z &&
|
||||
test "z$(git config branch.myr13.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase local on an untracked local branch' '
|
||||
git config branch.autosetuprebase local &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr14 mybase2 &&
|
||||
test "z$(git config branch.myr14.remote)" = z &&
|
||||
test "z$(git config branch.myr14.merge)" = z &&
|
||||
test "z$(git config branch.myr14.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase remote on an untracked local branch' '
|
||||
git config branch.autosetuprebase remote &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr15 mybase2 &&
|
||||
test "z$(git config branch.myr15.remote)" = z &&
|
||||
test "z$(git config branch.myr15.merge)" = z &&
|
||||
test "z$(git config branch.myr15.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase always on an untracked local branch' '
|
||||
git config branch.autosetuprebase always &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr16 mybase2 &&
|
||||
test "z$(git config branch.myr16.remote)" = z &&
|
||||
test "z$(git config branch.myr16.merge)" = z &&
|
||||
test "z$(git config branch.myr16.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase never on an untracked remote branch' '
|
||||
git config branch.autosetuprebase never &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr17 local/master &&
|
||||
test "z$(git config branch.myr17.remote)" = z &&
|
||||
test "z$(git config branch.myr17.merge)" = z &&
|
||||
test "z$(git config branch.myr17.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase local on an untracked remote branch' '
|
||||
git config branch.autosetuprebase local &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr18 local/master &&
|
||||
test "z$(git config branch.myr18.remote)" = z &&
|
||||
test "z$(git config branch.myr18.merge)" = z &&
|
||||
test "z$(git config branch.myr18.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase remote on an untracked remote branch' '
|
||||
git config branch.autosetuprebase remote &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr19 local/master &&
|
||||
test "z$(git config branch.myr19.remote)" = z &&
|
||||
test "z$(git config branch.myr19.merge)" = z &&
|
||||
test "z$(git config branch.myr19.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'autosetuprebase always on an untracked remote branch' '
|
||||
git config branch.autosetuprebase always &&
|
||||
git config remote.local.url . &&
|
||||
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
||||
(git show-ref -q refs/remotes/local/master || git-fetch local) &&
|
||||
git branch --no-track myr20 local/master &&
|
||||
test "z$(git config branch.myr20.remote)" = z &&
|
||||
test "z$(git config branch.myr20.merge)" = z &&
|
||||
test "z$(git config branch.myr20.rebase)" = z
|
||||
'
|
||||
|
||||
test_expect_success 'detect misconfigured autosetuprebase (bad value)' '
|
||||
git config branch.autosetuprebase garbage &&
|
||||
test_must_fail git branch
|
||||
'
|
||||
|
||||
test_expect_success 'detect misconfigured autosetuprebase (no value)' '
|
||||
git config --unset branch.autosetuprebase &&
|
||||
echo "[branch] autosetuprebase" >> .git/config &&
|
||||
test_must_fail git branch &&
|
||||
git config --unset branch.autosetuprebase
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Reference in New Issue
Block a user