diff options
| author | Jeff King <peff@peff.net> | 2024-09-05 23:47:38 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-06 08:02:26 -0700 |
| commit | 19ace71de05465c690d4eb297bd5d503f8e312b1 (patch) | |
| tree | e0b1181f1086425c6ce3ebbf2fc5ee41d463c614 | |
| parent | d39cc7185e0c1529917c0407036c9b09a94dd5ee (diff) | |
| download | git-19ace71de05465c690d4eb297bd5d503f8e312b1.tar.gz | |
sparse-checkout: check commit_lock_file when writing patterns
When writing a new "sparse-checkout" file, we do the usual strategy of
writing to a lockfile and committing it into place. But we don't check
the outcome of commit_lock_file(). Failing there would prevent us from
writing a bogus file (good), but we would ignore the error and return a
successful exit code (bad).
Fix this by calling die(). Note that we need to keep the sparse_filename
variable valid for longer, since the filename stored in the lock_file
struct will be dropped when we run commit_lock_file().
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/sparse-checkout.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index dfefe609a1..b5e220cc44 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -338,7 +338,6 @@ static int write_patterns_and_update(struct pattern_list *pl) fd = hold_lock_file_for_update(&lk, sparse_filename, LOCK_DIE_ON_ERROR); - free(sparse_filename); result = update_working_directory(pl); if (result) { @@ -355,10 +354,12 @@ static int write_patterns_and_update(struct pattern_list *pl) write_patterns_to_file(fp, pl); fflush(fp); - commit_lock_file(&lk); + if (commit_lock_file(&lk)) + die_errno(_("unable to write %s"), sparse_filename); out: clear_pattern_list(pl); + free(sparse_filename); return result; } |