summaryrefslogtreecommitdiff
path: root/builtin-send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-05 11:33:19 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-05 11:33:19 -0800
commitefcce2e1f0b37aed045d3e2b747380adf418bdd2 (patch)
tree709170cd9b9dbb34b9873bd482bf5f5f03ffd414 /builtin-send-pack.c
parent7bc9ed0d5b3dd2fb61cad033bb19e72358d54227 (diff)
parent045a476f91a9a308c823a2709977163238baa3fd (diff)
downloadgit-efcce2e1f0b37aed045d3e2b747380adf418bdd2.tar.gz
Merge branch 'mv/maint-branch-m-symref'
* 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 d68ce2d0e3..298bd71924 100644
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -240,7 +240,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);