Skip to content

Commit 72e4483

Browse files
jeffhostetlerdscho
authored andcommitted
index-pack: disable rev-index if index file has non .idx suffix
Teach index-pack to silently omit the reverse index if the index file does not have the standard ".idx" suffix. In e37d0b8 (builtin/index-pack.c: write reverse indexes, 2021-01-25) we learned to create `.rev` reverse indexes in addition to `.idx` index files. The `.rev` file pathname is constructed by replacing the suffix on the `.idx` file. The code assumes a hard-coded "idx" suffix. In a8dd7e0 (config: enable `pack.writeReverseIndex` by default, 2023-04-12) reverse indexes were enabled by default. If the `-o <idx-path>` argument is used, the index file may have a different suffix. This causes an error when it tries to create the reverse index pathname. Since we do not know why the user requested a non-standard suffix for the index, we cannot guess what the proper corresponding suffix should be for the reverse index. So we disable it. The t5300 test has been updated to verify that we no longer error out and that the .rev file is not created. TODO We could warn the user that we skipped it (perhaps only if they TODO explicitly requested `--rev-index` on the command line). TODO TODO Ideally, we should add an `--rev-index-path=<path>` argument TODO or change `--rev-index` to take a pathname. TODO TODO I'll leave these questions for a future series. Signed-off-by: Jeff Hostetler <jeffhostetler@github.com>
1 parent 0bae99d commit 72e4483

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

‎builtin/index-pack.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,6 +1894,7 @@ int cmd_index_pack(int argc,
18941894
unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */
18951895
int report_end_of_input = 0;
18961896
int hash_algo = 0;
1897+
int dash_o = 0;
18971898

18981899
/*
18991900
* index-pack never needs to fetch missing objects except when
@@ -1978,6 +1979,7 @@ int cmd_index_pack(int argc,
19781979
if (index_name || (i+1) >= argc)
19791980
usage(index_pack_usage);
19801981
index_name = argv[++i];
1982+
dash_o = 1;
19811983
} else if (starts_with(arg, "--index-version=")) {
19821984
char *c;
19831985
opts.version = strtoul(arg + 16, &c, 10);
@@ -2031,6 +2033,8 @@ int cmd_index_pack(int argc,
20312033
repo_set_hash_algo(the_repository, GIT_HASH_DEFAULT);
20322034

20332035
opts.flags &= ~(WRITE_REV | WRITE_REV_VERIFY);
2036+
if (rev_index && dash_o && !ends_with(index_name, ".idx"))
2037+
rev_index = 0;
20342038
if (rev_index) {
20352039
opts.flags |= verify ? WRITE_REV_VERIFY : WRITE_REV;
20362040
if (index_name)

‎t/t5300-pack-object.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,10 @@ test_expect_success 'complain about index name' '
374374
test -f test-complain-0.idx &&
375375
test -f test-complain-0.rev &&
376376
377-
# Non .idx suffix
377+
# Non .idx suffix -- implicitly omits the .rev
378378
cat test-1-${packname_1}.pack >test-complain-1.pack &&
379-
test_must_fail git index-pack -o test-complain-1.idx-suffix --rev-index test-complain-1.pack 2>err &&
380-
grep "does not end" err &&
381-
! test -f test-complain-1.idx-suffix &&
379+
git index-pack -o test-complain-1.idx-suffix --rev-index test-complain-1.pack &&
380+
test -f test-complain-1.idx-suffix &&
382381
! test -f test-complain-1.rev
383382
'
384383

0 commit comments

Comments
 (0)