author | Jeff King <peff@peff.net> | |
Sat, 17 Nov 2007 12:55:15 +0000 (07:55 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 17 Nov 2007 20:10:50 +0000 (12:10 -0800) | ||
commit | 1f0e2a1a65477c2b8eb8812e5bf0ad07bf03738e | |
tree | 22c3baee5e0a8a0a407d1c6e67f215969a65ce4c | tree | snapshot |
parent | 8736a8489080509516f5f4cc1cc74de33150f397 | commit | diff |
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>
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>
builtin-send-pack.c | diff | blob | history | |
t/t5404-tracking-branches.sh | diff | blob | history |