Merge branch 'lb/contrib-contacts-looser-diff-parsing'

gitster · gitster · commit ed277519613d · 2014-03-14T14:24:59.000-07:00
* lb/contrib-contacts-looser-diff-parsing:
  git-contacts: do not fail parsing of good diffs
diff --git 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;
