]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Reintegrate: omit source message ID from the merge message
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 21:33:26 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 21:33:26 +0000 (14:33 -0700)
Reintegrate

index 85d95bcecbb6ec0e46c3e09b82f39cec6866f509..ddff2664bcda4c149f91ef96d6684431021a5446 100755 (executable)
@@ -63,6 +63,7 @@ annotate_merge () {
                                }
                                next unless ($in_section && $in_desc);
                                next if (/Originally merged to '\''next'\'' on ([-0-9]+)/);
+                               next if (/^source: /);
                                last if (wildo_match($_));
                                push @msg, "$_\n";
                        }