Merge branch 'sv/checkout'

* sv/checkout:
  git-update-ref: add --no-deref option for overwriting/detaching ref
This commit is contained in:
Junio C Hamano
2007-05-20 02:18:47 -07:00
10 changed files with 39 additions and 30 deletions

View File

@ -42,7 +42,7 @@ static int update_ref(const char *action,
if (!rla)
rla = "(reflog update)";
snprintf(msg, sizeof(msg), "%s: %s", rla, action);
lock = lock_any_ref_for_update(refname, oldval);
lock = lock_any_ref_for_update(refname, oldval, 0);
if (!lock)
return 1;
if (write_ref_sha1(lock, sha1, msg) < 0)