diff options
| author | Derrick Stolee <stolee@gmail.com> | 2025-09-05 19:26:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-05 12:32:00 -0700 |
| commit | 3a45c7beb0f66bad122a1c319c71add5533e1f00 (patch) | |
| tree | dc0e68d84a097a742ab8cc1c3f93d2ee86062249 | |
| parent | midx-write: only load initialized packs (diff) | |
| download | git-3a45c7beb0f66bad122a1c319c71add5533e1f00.tar.gz git-3a45c7beb0f66bad122a1c319c71add5533e1f00.zip | |
midx-write: put failing response value back
This instance of setting the result to 1 before going to cleanup was
accidentally removed in fcb2205b77 (midx: implement support for writing
incremental MIDX chains, 2024-08-06). Build upon a test that already deletes
a packfile to verify that this error propagates to full command failure.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | midx-write.c | 1 | ||||
| -rwxr-xr-x | t/t5319-multi-pack-index.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/midx-write.c b/midx-write.c index 8203b50da1..4c8af23861 100644 --- a/midx-write.c +++ b/midx-write.c @@ -1122,6 +1122,7 @@ static int write_midx_internal(struct repository *r, const char *object_dir, m = m->base_midx; } } else if (ctx.m && fill_packs_from_midx(&ctx)) { + result = 1; goto cleanup; } diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh index 49705c62a2..2c22fdb931 100755 --- a/t/t5319-multi-pack-index.sh +++ b/t/t5319-multi-pack-index.sh @@ -1100,7 +1100,10 @@ test_expect_success 'load reverse index when missing .idx, .pack' ' mv $idx.bak $idx && mv $pack $pack.bak && - git cat-file --batch-check="%(objectsize:disk)" <tip + git cat-file --batch-check="%(objectsize:disk)" <tip && + + test_must_fail git multi-pack-index write 2>err && + test_grep "could not load pack" err ) ' |