diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-20 02:18:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-20 02:18:47 -0700 |
| commit | 063581e9b648b4da3b83061b06aed7ed417411e0 (patch) | |
| tree | f9e833dc777db2963aa49bfc2bb5d29b457f33d6 /fast-import.c | |
| parent | Merge branch 'np/pack' (diff) | |
| parent | git-update-ref: add --no-deref option for overwriting/detaching ref (diff) | |
| download | tgif-063581e9b648b4da3b83061b06aed7ed417411e0.tar.xz | |
Merge branch 'sv/checkout'
* sv/checkout:
git-update-ref: add --no-deref option for overwriting/detaching ref
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 3a2d5ed8e6..ffa00fd3c6 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)) { |