mirror of
https://github.com/git/git
synced 2024-10-12 11:32:34 +00:00
git-contacts: do not fail parsing of good diffs
If a line in a patch starts with "--- " it will be deemed malformed unless it also contains the proper diff header format. This situation can happen with a valid patch if it has a line starting with "-- " and that line is removed. This patch just removes the check in git-contacts. Signed-off-by: Lars Gullik Bjønnes <larsbj@gullik.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5f95c9f850
commit
8f72011f1c
|
@ -96,8 +96,6 @@ sub scan_patches {
|
||||||
next unless $id;
|
next unless $id;
|
||||||
if (m{^--- (?:a/(.+)|/dev/null)$}) {
|
if (m{^--- (?:a/(.+)|/dev/null)$}) {
|
||||||
$source = $1;
|
$source = $1;
|
||||||
} elsif (/^--- /) {
|
|
||||||
die "Cannot parse hunk source: $_\n";
|
|
||||||
} elsif (/^@@ -(\d+)(?:,(\d+))?/ && $source) {
|
} elsif (/^@@ -(\d+)(?:,(\d+))?/ && $source) {
|
||||||
my $len = defined($2) ? $2 : 1;
|
my $len = defined($2) ? $2 : 1;
|
||||||
push @{$sources->{$source}{$id}}, [$1, $len] if $len;
|
push @{$sources->{$source}{$id}}, [$1, $len] if $len;
|
||||||
|
|
Loading…
Reference in a new issue