summaryrefslogtreecommitdiff
path: root/contrib/contacts/git-contacts
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-14 14:24:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-14 14:24:59 -0700
commited277519613d6f6bb422c4e4b7523ef8981a1c25 (patch)
tree8dcf98637f86f0f425240669d5141cf224ab8305 /contrib/contacts/git-contacts
parentMerge branch 'ks/config-file-stdin' (diff)
parentgit-contacts: do not fail parsing of good diffs (diff)
downloadtgif-ed277519613d6f6bb422c4e4b7523ef8981a1c25.tar.xz
Merge branch 'lb/contrib-contacts-looser-diff-parsing'
* lb/contrib-contacts-looser-diff-parsing: git-contacts: do not fail parsing of good diffs
Diffstat (limited to 'contrib/contacts/git-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 428cc1a9a1..dbe2abf277 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;