Merge branch 'ar/send-pack-remote-track' into jk/send-pack

[git.git] / builtin-send-pack.c

diff --git a/builtin-send-pack.c b/builtin-send-pack.c
index 947c42b95028a3a19cef45d7eafa2f4e92de651c..22cb50bc2bf2767701c66afb0df5537fa89fe382 100644 (file)
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -348,7 +348,8 @@ static int do_send_pack(int in, int out, struct remote *remote, int nr_refspec,
 
        if (!args.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)