@matheusbsbs / matheus-bagliano / commits / 67360b75c6

diff: fix filtering of merge commits under --remerge-diff

Commit 95433eeed9 ("diff: add ability to insert additional headers for paths", 2022-02-02) introduced the possibility of additional headers. Because there could be conflicts with no content differences (e.g. a modify/delete conflict resolved in favor of taking the modified file as-is), that commit also modified the diff_queue_is_empty() and diff_flush_patch() logic to ensure these headers were included even if there was no associated content diff. However, the added logic was a bit inconsistent between these two functions. diff_queue_is_empty() overlooked the fact that the additional headers strmap could be non-NULL and empty, which would cause it to display commits that should have been filtered out. Fix the diff_queue_is_empty() logic to also account for additional_path_headers being empty. Reported-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Sep 2, 2022 at 03:53 UTC 67360b75c605e6c1458304378bda8255f72d96b9

2 files changed +6

diff.c

@@ -5925,6 +5925,7 @@ int diff_queue_is_empty(struct diff_options *o)

5925 int i;

5926 int include_conflict_headers =

5927 (o->additional_path_headers &&

5928 + strmap_get_size(o->additional_path_headers) &&

5929 !o->pickaxe_opts &&

5930 (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));

5931

t/t4069-remerge-diff.sh

@@ -56,6 +56,11 @@ test_expect_success 'remerge-diff on a clean merge' '

56 test_cmp expect actual

57 '

59 +test_expect_success 'remerge-diff on a clean merge with a filter' '

60 + git show --oneline --remerge-diff --diff-filter=U bc_resolution >actual &&

61 + test_must_be_empty actual

62 +'

63 +

64 test_expect_success 'remerge-diff with both a resolved conflict and an unrelated change' '

65 git log -1 --oneline ab_resolution >tmp &&

66 cat <<-EOF >>tmp &&