diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-07-22 10:03:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-07-22 14:00:02 -0700 |
| commit | 47382f7398df0c8509c30aac6aafa75272099ca5 (patch) | |
| tree | 808ada47b4d67fb6253778483175ce37583fba82 /t/t4013/diff.diff_initial..side | |
| parent | 94f057755b7941b321fd11fec1b2e3ca5313a4e0 (diff) | |
revision: honor --exclude-first-parent-only with SEEN first parent
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>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions
