diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-16 08:22:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-16 08:22:43 (GMT) |
| commit | 5c088a22e2892850aacf1411572b2c0b838c28db (patch) | |
| tree | 3659507e27cdae07e7bc112f4853ebcaa6bbc052 /t | |
| parent | 57bd934ea69f0151b729b74fd77629b94920cca7 (diff) | |
| parent | f1eccbab638df66a7d8ec881f6f695514b26f44f (diff) | |
| download | git-5c088a22e2892850aacf1411572b2c0b838c28db.zip git-5c088a22e2892850aacf1411572b2c0b838c28db.tar.gz git-5c088a22e2892850aacf1411572b2c0b838c28db.tar.bz2 | |
Merge branch 'gp/branch'
* gp/branch:
git-branch: cleanup config file when deleting branches
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 6f6d884..f1793d0 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -171,6 +171,15 @@ test_expect_success 'test tracking setup via --track but deeper' \ test "$(git-config branch.my7.remote)" = local && test "$(git-config branch.my7.merge)" = refs/heads/o/o' +test_expect_success 'test deleting branch deletes branch config' \ + 'git-branch -d my7 && + test "$(git-config branch.my7.remote)" = "" && + test "$(git-config branch.my7.merge)" = ""' + +test_expect_success 'test deleting branch without config' \ + 'git-branch my7 s && + test "$(git-branch -d my7 2>&1)" = "Deleted branch my7."' + # Keep this test last, as it changes the current branch cat >expect <<EOF 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master |