diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-09 00:19:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-09 00:19:50 -0700 |
| commit | bb293b831b9d0aade79c0acf5bf6091106e7d19b (patch) | |
| tree | 6549f6423c83a66b04bf51daedcb5fa592170c27 /t/t5404-tracking-branches.sh | |
| parent | fd11ae0b52b6d059056a32851a916c152befae1a (diff) | |
| parent | e09c4e753c337d914f4eb7a05cb5e8bbfc362489 (diff) | |
| download | git-bb293b831b9d0aade79c0acf5bf6091106e7d19b.tar.gz | |
Merge branch 'maint'
* maint:
Start preparing release notes for 1.5.6.3
git-submodule - Fix bugs in adding an existing repo as a module
bash: offer only paths after '--'
Remove unnecessary pack-*.keep file after successful git-clone
make deleting a missing ref more quiet
Diffstat (limited to 't/t5404-tracking-branches.sh')
| -rwxr-xr-x | t/t5404-tracking-branches.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh index 1493a92c06..64fe2615ac 100755 --- a/t/t5404-tracking-branches.sh +++ b/t/t5404-tracking-branches.sh @@ -10,6 +10,7 @@ test_expect_success 'setup' ' git commit -m 1 && git branch b1 && git branch b2 && + git branch b3 && git clone . aa && git checkout b1 && echo b1 >>file && @@ -50,4 +51,10 @@ test_expect_success 'deleted branches have their tracking branches removed' ' test "$(git rev-parse origin/b1)" = "origin/b1" ' +test_expect_success 'already deleted tracking branches ignored' ' + git branch -d -r origin/b3 && + git push origin :b3 >output 2>&1 && + ! grep error output +' + test_done |