diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-10-26 03:33:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-26 14:42:57 -0700 |
| commit | eca35a25a92a1ad725af2a549fc9158488c4cc43 (patch) | |
| tree | d598c2304f5c3f6d4bee5aa2cb4ce15fab117bf2 /builtin-send-pack.c | |
| parent | 031e6c898f61db1ae0c0be641eac6532c1000d56 (diff) | |
| download | git-eca35a25a92a1ad725af2a549fc9158488c4cc43.tar.gz git-eca35a25a92a1ad725af2a549fc9158488c4cc43.tar.xz | |
Fix git branch -m for symrefs.
This had two problems with symrefs. First, it copied the actual sha1
instead of the "pointer", second it failed to remove the old ref after a
successful rename.
Given that till now delete_ref() always dereferenced symrefs, a new
parameters has been introduced to delete_ref() to allow deleting refs
without a dereference.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-send-pack.c')
| -rw-r--r-- | builtin-send-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-send-pack.c b/builtin-send-pack.c index 2af9f2934..ea1ad6e35 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -226,7 +226,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); |