dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-07 16:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

revision: honor --exclude-first-parent-only with SEEN first parent

Browse Source 
The '--exclude-first-parent-only' option instructs the revision
walker to follow only the first parent of a merge commit to
propagate down the UNINTERESTING bit.

However, if the first parent has already been marked SEEN (for
example, because it was explicitly specified on the command line),
process_parents() skips it with a 'continue' statement.  But the
loop then continues on to process the second parent, because the
check for the '--exclude-first-parent-only' option is near the end
of the loop, which the 'continue' statement skips.  Consequently, we
end up marking the second parent as UNINTERESTING.

Break out of the loop instead of continuing when the first parent is
already SEEN or fails to parse.  This ensures that we do not process
subsequent parents and mark them as UNINTERESTING.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Jerry Zhang <jerry@skydio.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2026-07-22 10:03:13 -07:00
parent 94f057755b
commit 47382f7398
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
revision.c
View File

@@ -1152,12 +1152,18 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
if (p)
p->object.flags |= UNINTERESTING |
CHILD_VISITED;
if (repo_parse_commit_gently(revs->repo, p, 1) < 0)
if (repo_parse_commit_gently(revs->repo, p, 1) < 0) {
if (revs->exclude_first_parent_only)
break;
continue;
}
if (p->parents)
mark_parents_uninteresting(revs, p);
if (p->object.flags & SEEN)
if (p->object.flags & SEEN) {
if (revs->exclude_first_parent_only)
break;
continue;
}
p->object.flags |= (SEEN | NOT_USER_GIVEN);
if (list)
commit_list_insert_by_date(p, list);

18
t/t6012-rev-list-simplify.sh
View File

@@ -285,4 +285,22 @@ test_expect_success 'log --graph --simplify-merges --show-pulls' '
test_cmp expect actual
'
test_expect_success 'exclude-first-parent-only with parent already seen' '
git checkout --orphan test-seen &&
git rm -rf . &&
test_commit r1 &&
git checkout -b branch-f &&
test_commit f &&
git checkout test-seen &&
git merge --no-ff --no-edit -m r2 branch-f &&
git tag r2 &&
git rev-list --exclude-first-parent-only f ^r2 >actual &&
git rev-parse f >expect &&
test_cmp expect actual &&
git rev-list --exclude-first-parent-only f r1 ^r2 >actual2 &&
test_cmp expect actual2
'
test_done