Re: [PATCH] push: fix local refs update if already up-to-date

From: Clemens Buchacher <drizzd@aon.at>
Date: Nov 5, 2008, 21:57 UTC
Message-ID: <20081105215706.GA32063@localhost>
In-Reply-To: <20081105202849.GA9484@localhost>

On Wed, Nov 05, 2008 at 09:28:49PM +0100, Clemens Buchacher wrote:

Show 6 quoted lines

> On Tue, Nov 04, 2008 at 09:49:32PM -0500, Jeff King wrote:
> [...]
> > However, I would like to make one additional request.  Since you are
> > killing off all usage of new_sha1 initial assignment, I think it makes
> > sense to just get rid of the variable entirely, so it cannot create
> > confusion later.

Considering that the ref is initialized to the null_sha1, do you think it would be Ok to do the following instead? The call to hashcpy would not be needed twice and we get rid of the temporary new_sha1.

--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -435,24 +435,18 @@ static int do_send_pack(int in, int out, struct remote *re
         */
        new_refs = 0;
        for (ref = remote_refs; ref; ref = ref->next) {
-               const unsigned char *new_sha1;
-
-               if (!ref->peer_ref) {
-                       if (!args.send_mirror)
-				continue;
-                       new_sha1 = null_sha1;
-               }
-               else
-                       new_sha1 = ref->peer_ref->new_sha1;
-
+               if (ref->peer_ref)
+                       hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
+               else if (!args.send_mirror)
+                       continue;