summaryrefslogtreecommitdiff
path: root/git-annotate.perl
diff options
context:
space:
mode:
authorRyan Anderson <ryan@michonline.com>2006-03-02 05:23:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-02 05:32:17 (GMT)
commite5971d7d138879c071643e4e08fceb4d0ae354ac (patch)
treef761301c3c4b5ebef9fa60025ca2d2483dc4ce4c /git-annotate.perl
parent5aa44d50f41214d573fa76095dd4410dd6c46f13 (diff)
downloadgit-e5971d7d138879c071643e4e08fceb4d0ae354ac.zip
git-e5971d7d138879c071643e4e08fceb4d0ae354ac.tar.gz
git-e5971d7d138879c071643e4e08fceb4d0ae354ac.tar.bz2
annotate: handle \No newline at end of file.
Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-annotate.perl')
-rwxr-xr-xgit-annotate.perl6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-annotate.perl b/git-annotate.perl
index f9c2c6c..d6028c9 100755
--- a/git-annotate.perl
+++ b/git-annotate.perl
@@ -304,6 +304,12 @@ sub _git_diff_parse {
}
$ri++;
+ } elsif (m/^\\/) {
+ ;
+ # Skip \No newline at end of file.
+ # But this can be internationalized, so only look
+ # for an initial \
+
} else {
if (substr($_,1) ne get_line($slines,$ri) ) {
die sprintf("Line %d (%d) does not match:\n|%s\n|%s\n%s => %s\n",