git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-14 15:01:15 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

commit-reach: die on contains walk errors

Browse Source 
Without generation numbers, repo_is_descendant_of() can return -1 when
it cannot read commit ancestry. commit_contains() exposes that result
through a Boolean interface, so ref-filter treats it as true. This can
include a ref for --contains or exclude it for --no-contains without
failing the command.

Die when repo_is_descendant_of() reports an error. The memoized walk
already dies when it cannot parse a commit, so callers of the
non-memoized path no longer turn a failed walk into a match.

Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tamir Duberstein
2026-06-12 17:49:14 -04:00
committed by Junio C Hamano
parent ca96eeee79
commit ff3ba7d158
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
commit-reach.c
View File

@@ -854,10 +854,16 @@ static enum contains_result contains_tag_algo(struct commit *candidate,
int commit_contains(struct ref_filter *filter, struct commit *commit,
struct commit_list *list, struct contains_cache *cache)
{
int result;
if (filter->with_commit_tag_algo ||
generation_numbers_enabled(the_repository))
return contains_tag_algo(commit, list, cache) == CONTAINS_YES;
return repo_is_descendant_of(the_repository, commit, list);
result = repo_is_descendant_of(the_repository, commit, list);
if (result < 0)
die(_("failed to check reachability"));
return result;
}
int can_all_from_reach_with_flag(struct object_array *from,

22
t/t6301-for-each-ref-errors.sh
View File

@@ -52,6 +52,28 @@ test_expect_success 'Missing objects are reported correctly' '
test_must_be_empty brief-err
'
test_expect_success 'missing ancestors are reported by contains filters' '
test_when_finished "git update-ref -d refs/heads/missing-parent" &&
{
echo "tree $(git rev-parse HEAD^{tree})" &&
echo "parent $MISSING" &&
git cat-file commit HEAD |
sed -n -e "/^author /p" -e "/^committer /p" &&
echo &&
echo "missing parent"
} >commit &&
broken=$(git hash-object -t commit -w commit) &&
git update-ref refs/heads/missing-parent "$broken" &&
for option in --contains --no-contains
do
test_must_fail git for-each-ref "$option=HEAD" \
refs/heads/missing-parent >out 2>err &&
test_must_be_empty out &&
test_grep "parse commit $MISSING" err ||
return 1
done
'
test_expect_success 'ahead-behind requires an argument' '
test_must_fail git for-each-ref \
--format="%(ahead-behind)" 2>err &&