From: Jay Soffian Date: Mon, 18 Feb 2008 15:07:25 GMT Subject: [PATCH] test cases: optionally setup branch.*.merge from upstream local branches Message-ID: <1203347245-23533-1-git-send-email-jaysoffian@gmail.com> Added test cases for new "optionally setup branch.*.merge from upstream local branches" functionality. Signed-off-by: Jay Soffian --- t/t3200-branch.sh | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index d21081d..8d1dccd 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -161,7 +161,7 @@ test_expect_success 'avoid ambiguous track' ' ' test_expect_success 'test overriding tracking setup via --no-track' \ - 'git config branch.autosetupmerge true && + 'git config branch.autosetupmerge 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) && @@ -171,7 +171,9 @@ test_expect_success 'test overriding tracking setup via --no-track' \ ! test "$(git config branch.my2.merge)" = refs/heads/master' test_expect_success 'no tracking without .fetch entries' \ - 'git branch --track my6 s && + 'git config branch.autosetupmerge true && + git branch my6 s && + git config branch.automsetupmerge false && test -z "$(git config branch.my6.remote)" && test -z "$(git config branch.my6.merge)"' @@ -192,6 +194,21 @@ test_expect_success 'test deleting branch without config' \ 'git branch my7 s && test "$(git branch -d my7 2>&1)" = "Deleted branch my7."' +test_expect_success 'test tracking without .fetch entries w/--track given' \ + 'git branch --track my8 && + test "$(git config branch.my8.remote)" && + test "$(git config branch.my8.merge)"' + +test_expect_success \ + 'test tracking without .fetch entries w/autosetupmerge=always' \ + 'git config branch.autosetupmerge always && + git branch --track my9 && + git config branch.autosetupmerge false + test "$(git config branch.my9.remote)" && + test "$(git config branch.my9.merge)"' + + + # Keep this test last, as it changes the current branch cat >expect < 1117150200 +0000 branch: Created from master -- 1.5.4.2.203.gf8d86