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

* ar/send-pack-remote-track:
  Update the tracking references only if they were succesfully updated on remote
  Add a test checking if send-pack updated local tracking branches correctly

diff --cc builtin-send-pack.c
index 947c42b,d56d980..22cb50b
--- 1/builtin-send-pack.c
--- 2/send-pack.c
+++ b/builtin-send-pack.c
@@@ -346,9 -347,10 +346,10 @@@ static int do_send_pack(int in, int out
                        ret = -4;
        }
  
 -      if (!dry_run && remote && ret == 0) {
 +      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)