diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-11-02 13:36:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 13:36:14 -0800 |
| commit | 581000a4196d196d221bb6164a49a8a52ce30730 (patch) | |
| tree | d177274e6739292d466213fc02abf5811bf86ce6 /builtin-revert.c | |
| parent | Start 1.6.0.4 cycle (diff) | |
| parent | Enhance hold_lock_file_for_{update,append}() API (diff) | |
| download | tgif-581000a4196d196d221bb6164a49a8a52ce30730.tar.xz | |
Merge branch 'jc/maint-co-track' into maint
* jc/maint-co-track:
Enhance hold_lock_file_for_{update,append}() API
demonstrate breakage of detached checkout with symbolic link HEAD
Fix "checkout --track -b newbranch" on detached HEAD
Diffstat (limited to 'builtin-revert.c')
| -rw-r--r-- | builtin-revert.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-revert.c b/builtin-revert.c index c41788685b..786a956f26 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -338,7 +338,8 @@ static int revert_or_cherry_pick(int argc, const char **argv) * reverse of it if we are revert. */ - msg_fd = hold_lock_file_for_update(&msg_file, defmsg, 1); + msg_fd = hold_lock_file_for_update(&msg_file, defmsg, + LOCK_DIE_ON_ERROR); encoding = get_encoding(message); if (!encoding) |