Skip to content

Commit

Permalink
Update the tracking references only if they were succesfully updated …
Browse files Browse the repository at this point in the history
…on remote

It fixes the bug where local tracking branches were filled with zeroed
SHA-1 if the remote branch was not updated because, for instance, it
was not an ancestor of the local (i.e. had other changes).

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Alex Riesen authored and Junio C Hamano committed Nov 13, 2007
1 parent 6fa92bf commit ed31df3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion send-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,8 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, cha

if (!dry_run && remote && ret == 0) {
for (ref = remote_refs; ref; ref = ref->next)
update_tracking_ref(remote, ref);
if (!is_null_sha1(ref->new_sha1))
update_tracking_ref(remote, ref);
}

if (!new_refs && ret == 0)
Expand Down

0 comments on commit ed31df3

Please sign in to comment.