Home » Mailing list archives » git » 2007 » November » 12

[PATCH] Update the tracking references only if they were succesfully updated on remote

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Alex Riesen <raa.lkml@...>
To: <git@...>
Cc: Jeff King <peff@...>, Junio C Hamano <junkio@...>
Subject: [PATCH] Update the tracking references only if they were succesfully updated on remote
Date: Monday, November 12, 2007 - 5:39 pm

It fixes the bug where local tracing 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>
---

Jeff, I think your change (334f4831e5a77) was either not complete or
got broken some time later.

 send-pack.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/send-pack.c b/send-pack.c
index b74fd45..d56d980 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -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)
-- 
1.5.3.5.648.g1e92c

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] Add a test checking if send-pack updated local track..., Alex Riesen, (Mon Nov 12, 5:38 pm)
[PATCH] Update the tracking references only if they were suc..., Alex Riesen, (Mon Nov 12, 5:39 pm)
Re: [PATCH] Update the tracking references only if they were..., Jeff King, (Tue Nov 13, 3:52 am)
Re: [PATCH] Update the tracking references only if they were..., Alex Riesen, (Tue Nov 13, 3:47 pm)
[PATCH] Add a test for deleting remote branches, Alex Riesen, (Tue Nov 13, 3:49 pm)
[PATCH] Improved and extended t5404, Alex Riesen, (Tue Nov 13, 7:02 pm)
Re: [PATCH] Improved and extended t5404, Junio C Hamano, (Wed Nov 14, 5:52 pm)
Re: [PATCH] Improved and extended t5404, Junio C Hamano, (Wed Nov 14, 5:52 pm)
[PATCH] Add test that checks diverse aspects of updating rem..., Alex Riesen, (Wed Nov 14, 6:49 pm)
Re: [PATCH] Improved and extended t5404, Junio C Hamano, (Tue Nov 13, 8:02 pm)
Re: [PATCH] Improved and extended t5404, Alex Riesen, (Wed Nov 14, 3:19 am)
Re: [PATCH] Improved and extended t5404, Jeff King, (Thu Nov 15, 12:18 am)
Re: [PATCH] Improved and extended t5404, Jeff King, (Thu Nov 15, 12:35 am)
Re: [PATCH] Improved and extended t5404, Junio C Hamano, (Thu Nov 15, 1:55 am)
Re: [PATCH] Improved and extended t5404, Johannes Schindelin, (Wed Nov 14, 1:10 pm)
Re: [PATCH] Improved and extended t5404, Alex Riesen, (Wed Nov 14, 3:45 pm)
Re: [PATCH] Improved and extended t5404, Alex Riesen, (Wed Nov 14, 4:34 pm)
Re: [PATCH] Improved and extended t5404, Johannes Schindelin, (Wed Nov 14, 6:01 pm)
Re: [PATCH] Improved and extended t5404, Junio C Hamano, (Wed Nov 14, 4:47 am)
Re: [PATCH] Improved and extended t5404, Jeff King, (Tue Nov 13, 7:10 pm)
Re: [PATCH] Improved and extended t5404, Jeff King, (Thu Nov 15, 12:26 am)
[PATCH] Add test that checks diverse aspects of updating rem..., Alex Riesen, (Thu Nov 15, 4:46 pm)