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-fetch-pack.c | |
| parent | 1a9016aae5aa8c468bb2d8d5dd16303d5c005869 (diff) | |
| parent | acd3b9eca82e38950f94e4708b528b7dae09a7c8 (diff) | |
| download | git-581000a4196d196d221bb6164a49a8a52ce30730.tar.gz | |
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-fetch-pack.c')
| -rw-r--r-- | builtin-fetch-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 85509f5ee5..21ce3e0163 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -813,7 +813,8 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args, ) die("shallow file was changed during fetch"); - fd = hold_lock_file_for_update(&lock, shallow, 1); + fd = hold_lock_file_for_update(&lock, shallow, + LOCK_DIE_ON_ERROR); if (!write_shallow_commits(fd, 0)) { unlink(shallow); rollback_lock_file(&lock); |