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 /builtin-reflog.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 'builtin-reflog.c')
| -rw-r--r-- | builtin-reflog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-reflog.c b/builtin-reflog.c index 4c39f1da98..ce093cad78 100644 --- a/builtin-reflog.c +++ b/builtin-reflog.c @@ -249,7 +249,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, /* we take the lock for the ref itself to prevent it from * getting updated. */ - lock = lock_any_ref_for_update(ref, sha1); + lock = lock_any_ref_for_update(ref, sha1, 0); if (!lock) return error("cannot lock ref '%s'", ref); log_file = xstrdup(git_path("logs/%s", ref)); |