diff options
| author | Jeff King <peff@peff.net> | 2007-11-17 07:55:15 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-17 12:10:50 -0800 |
| commit | 1f0e2a1a65477c2b8eb8812e5bf0ad07bf03738e (patch) | |
| tree | 22c3baee5e0a8a0a407d1c6e67f215969a65ce4c /t/t5404-tracking-branches.sh | |
| parent | 8736a8489080509516f5f4cc1cc74de33150f397 (diff) | |
| download | git-1f0e2a1a65477c2b8eb8812e5bf0ad07bf03738e.tar.gz git-1f0e2a1a65477c2b8eb8812e5bf0ad07bf03738e.tar.xz | |
send-pack: check ref->status before updating tracking refs
Previously, we manually checked the 'NONE' and 'UPTODATE'
conditions. Now that we have ref->status, we can easily
say "only update if we pushed successfully".
This adds a test for and fixes a regression introduced in
ed31df31 where deleted refs did not have their tracking
branches removed. This was due to a bogus per-ref error test
that is superseded by the more accurate ref->status flag.
Signed-off-by: Jeff King <peff@peff.net>
Completely-Acked-By: Alex "Sleepy" Riesen <raa.lkml@gmail.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5404-tracking-branches.sh')
| -rwxr-xr-x | t/t5404-tracking-branches.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh index 799e47e5b..1493a92c0 100755 --- a/t/t5404-tracking-branches.sh +++ b/t/t5404-tracking-branches.sh @@ -45,4 +45,9 @@ test_expect_success 'check tracking branches not updated for failed refs' ' test "$(git rev-parse origin/b2)" = "$b2" ' +test_expect_success 'deleted branches have their tracking branches removed' ' + git push origin :b1 && + test "$(git rev-parse origin/b1)" = "origin/b1" +' + test_done |