summaryrefslogtreecommitdiff
path: root/contrib/contacts
diff options
context:
space:
mode:
authorLars Gullik Bjønnes <larsbj@gullik.org>2014-02-15 17:24:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-02-18 23:10:47 (GMT)
commit8f72011f1c4a626ed1c1e826661d42274f465e29 (patch)
tree484a9a2368e9367349b4ea3fe666a2bc6f8a5506 /contrib/contacts
parent5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff)
downloadgit-8f72011f1c4a626ed1c1e826661d42274f465e29.zip
git-8f72011f1c4a626ed1c1e826661d42274f465e29.tar.gz
git-8f72011f1c4a626ed1c1e826661d42274f465e29.tar.bz2
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>
Diffstat (limited to 'contrib/contacts')
-rwxr-xr-xcontrib/contacts/git-contacts2
1 files changed, 0 insertions, 2 deletions
diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts
index 428cc1a..dbe2abf 100755
--- a/contrib/contacts/git-contacts
+++ b/contrib/contacts/git-contacts
@@ -96,8 +96,6 @@ sub scan_patches {
next unless $id;
if (m{^--- (?:a/(.+)|/dev/null)$}) {
$source = $1;
- } elsif (/^--- /) {
- die "Cannot parse hunk source: $_\n";
} elsif (/^@@ -(\d+)(?:,(\d+))?/ && $source) {
my $len = defined($2) ? $2 : 1;
push @{$sources->{$source}{$id}}, [$1, $len] if $len;