diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-05 11:33:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-05 11:33:19 -0800 |
| commit | efcce2e1f0b37aed045d3e2b747380adf418bdd2 (patch) | |
| tree | 709170cd9b9dbb34b9873bd482bf5f5f03ffd414 /builtin-remote.c | |
| parent | 7bc9ed0d5b3dd2fb61cad033bb19e72358d54227 (diff) | |
| parent | 045a476f91a9a308c823a2709977163238baa3fd (diff) | |
| download | git-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-remote.c')
| -rw-r--r-- | builtin-remote.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-remote.c b/builtin-remote.c index df2be068b6..e396a3ac90 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -337,7 +337,7 @@ static int remove_branches(struct string_list *branches) const char *refname = item->string; unsigned char *sha1 = item->util; - if (delete_ref(refname, sha1)) + if (delete_ref(refname, sha1, 0)) result |= error("Could not remove branch %s", refname); } return result; @@ -565,7 +565,7 @@ static int prune(int argc, const char **argv) const char *refname = states.stale.items[i].util; if (!dry_run) - result |= delete_ref(refname, NULL); + result |= delete_ref(refname, NULL, 0); printf(" * [%s] %s\n", dry_run ? "would prune" : "pruned", abbrev_ref(refname, "refs/remotes/")); |