diff options
| author | Sven Verdoolaege <skimo@kotnet.org> | 2007-05-09 12:33:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-10 15:24:44 -0700 |
| commit | 68db31cc289c686c4b4454dfbb121aff59a6c602 (patch) | |
| tree | e2a02bc97e8afad4327f9ece6bc81ca497f26602 /fast-import.c | |
| parent | 843142ada000a992fa87bd2dc7796501332a52d9 (diff) | |
| download | git-68db31cc289c686c4b4454dfbb121aff59a6c602.tar.gz git-68db31cc289c686c4b4454dfbb121aff59a6c602.tar.xz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 3a2d5ed8e..ffa00fd3c 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)) { |