From 1f0e2a1a65477c2b8eb8812e5bf0ad07bf03738e Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 17 Nov 2007 07:55:15 -0500 Subject: 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 Completely-Acked-By: Alex "Sleepy" Riesen Acked-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- t/t5404-tracking-branches.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 't') diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh index 799e47e5ba..1493a92c06 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 -- cgit v1.2.1