diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-18 00:44:39 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 21:35:37 +0200 |
| commit | acd3b9eca82e38950f94e4708b528b7dae09a7c8 (patch) | |
| tree | f341dae377b97e9c7fd9746208be0fee56bda438 /builtin-fetch-pack.c | |
| parent | demonstrate breakage of detached checkout with symbolic link HEAD (diff) | |
| download | git-acd3b9eca82e38950f94e4708b528b7dae09a7c8.tar.xz git-acd3b9eca82e38950f94e4708b528b7dae09a7c8.zip | |
Enhance hold_lock_file_for_{update,append}() API
This changes the "die_on_error" boolean parameter to a mere "flags", and
changes the existing callers of hold_lock_file_for_update/append()
functions to pass LOCK_DIE_ON_ERROR.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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); |