diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-08 16:07:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-08 16:07:37 -0800 |
| commit | 3b8572a4297d8720b359c82e1dd9afeb45cda3cd (patch) | |
| tree | 88163ad281fc3b0e69246ccb026cddd4bae0b367 /builtin-reset.c | |
| parent | 16088d8870b7da6d4dd280be2d1728dd3be346b5 (diff) | |
| parent | 045a476f91a9a308c823a2709977163238baa3fd (diff) | |
| download | git-3b8572a4297d8720b359c82e1dd9afeb45cda3cd.tar.gz git-3b8572a4297d8720b359c82e1dd9afeb45cda3cd.tar.xz | |
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-reset.c')
| -rw-r--r-- | builtin-reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-reset.c b/builtin-reset.c index 16e6bb20f..9514b77f8 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -279,7 +279,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) update_ref(msg, "ORIG_HEAD", orig, old_orig, 0, MSG_ON_ERR); } else if (old_orig) - delete_ref("ORIG_HEAD", old_orig); + delete_ref("ORIG_HEAD", old_orig, 0); prepend_reflog_action("updating HEAD", msg, sizeof(msg)); update_ref_status = update_ref(msg, "HEAD", sha1, orig, 0, MSG_ON_ERR); |