diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:11 -0700 |
| commit | a157400c972bbdeab2b5629658c99839c855f5ab (patch) | |
| tree | 95c9ae9bf86dcc6e2bd4a3b0b217f5bef8622b59 /builtin-revert.c | |
| parent | 6af50f7536d559f891d08597203ba605726511d6 (diff) | |
| parent | acd3b9eca82e38950f94e4708b528b7dae09a7c8 (diff) | |
| download | git-a157400c972bbdeab2b5629658c99839c855f5ab.tar.gz git-a157400c972bbdeab2b5629658c99839c855f5ab.tar.xz | |
Merge branch 'jc/maint-co-track'
* 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
Conflicts:
builtin-commit.c
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 848653974..472554019 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -329,7 +329,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) |