diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-22 00:58:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-22 00:58:11 (GMT) |
| commit | a157400c972bbdeab2b5629658c99839c855f5ab (patch) | |
| tree | 95c9ae9bf86dcc6e2bd4a3b0b217f5bef8622b59 /builtin-commit.c | |
| parent | 6af50f7536d559f891d08597203ba605726511d6 (diff) | |
| parent | acd3b9eca82e38950f94e4708b528b7dae09a7c8 (diff) | |
| download | git-a157400c972bbdeab2b5629658c99839c855f5ab.zip git-a157400c972bbdeab2b5629658c99839c855f5ab.tar.gz git-a157400c972bbdeab2b5629658c99839c855f5ab.tar.bz2 | |
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-commit.c')
| -rw-r--r-- | builtin-commit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 33b659e..93ca496 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -320,7 +320,9 @@ static char *prepare_index(int argc, const char **argv, const char *prefix) die("unable to write new_index file"); fd = hold_lock_file_for_update(&false_lock, - git_path("next-index-%"PRIuMAX, (uintmax_t) getpid()), 1); + git_path("next-index-%"PRIuMAX, + (uintmax_t) getpid()), + LOCK_DIE_ON_ERROR); create_base_index(); add_remove_files(&partial); |