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-commit.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-commit.c')
| -rw-r--r-- | builtin-commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index e2a7e48b1c..b563a0d67c 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -320,7 +320,8 @@ 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-%d", getpid()), 1); + git_path("next-index-%d", getpid()), + LOCK_DIE_ON_ERROR); create_base_index(); add_remove_files(&partial); |