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.
This commit is contained in:
Junio C Hamano
2008-11-05 11:33:19 -08:00
11 changed files with 65 additions and 24 deletions

View File

@ -160,7 +160,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
continue;
}
if (delete_ref(name, sha1)) {
if (delete_ref(name, sha1, 0)) {
error("Error deleting %sbranch '%s'", remote,
argv[i]);
ret = 1;