summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorSven Verdoolaege <skimo@kotnet.org>2007-05-09 10:33:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-10 22:24:44 (GMT)
commit68db31cc289c686c4b4454dfbb121aff59a6c602 (patch)
treee2a02bc97e8afad4327f9ece6bc81ca497f26602 /fast-import.c
parent843142ada000a992fa87bd2dc7796501332a52d9 (diff)
downloadgit-68db31cc289c686c4b4454dfbb121aff59a6c602.zip
git-68db31cc289c686c4b4454dfbb121aff59a6c602.tar.gz
git-68db31cc289c686c4b4454dfbb121aff59a6c602.tar.bz2
git-update-ref: add --no-deref option for overwriting/detaching ref
git-checkout is also adapted to make use of this new option instead of the handcrafted command sequence. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index 3a2d5ed..ffa00fd 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1271,7 +1271,7 @@ static int update_branch(struct branch *b)
if (read_ref(b->name, old_sha1))
hashclr(old_sha1);
- lock = lock_any_ref_for_update(b->name, old_sha1);
+ lock = lock_any_ref_for_update(b->name, old_sha1, 0);
if (!lock)
return error("Unable to lock %s", b->name);
if (!force_update && !is_null_sha1(old_sha1)) {