summaryrefslogtreecommitdiff
path: root/builtin-send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-08 16:07:37 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-08 16:07:37 -0800
commit3b8572a4297d8720b359c82e1dd9afeb45cda3cd (patch)
tree88163ad281fc3b0e69246ccb026cddd4bae0b367 /builtin-send-pack.c
parent16088d8870b7da6d4dd280be2d1728dd3be346b5 (diff)
parent045a476f91a9a308c823a2709977163238baa3fd (diff)
downloadgit-3b8572a4297d8720b359c82e1dd9afeb45cda3cd.tar.gz
Merge branch 'mv/maint-branch-m-symref' into maint
* mv/maint-branch-m-symref: update-ref --no-deref -d: handle the case when the pointed ref is packed git branch -m: forbid renaming of a symref Fix git update-ref --no-deref -d. rename_ref(): handle the case when the reflog of a ref does not exist Fix git branch -m for symrefs.
Diffstat (limited to 'builtin-send-pack.c')
-rw-r--r--builtin-send-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-send-pack.c b/builtin-send-pack.c
index 301f230432..ed94f9a460 100644
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -232,7 +232,7 @@ static void update_tracking_ref(struct remote *remote, struct ref *ref)
if (args.verbose)
fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
if (ref->deletion) {
- delete_ref(rs.dst, NULL);
+ delete_ref(rs.dst, NULL, 0);
} else
update_ref("update by push", rs.dst,
ref->new_sha1, NULL, 0, 0);