projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale
[git.git]
/
git-annotate.perl
diff --git
a/git-annotate.perl
b/git-annotate.perl
index
9df72a1
..
a6a7a48
100755
(executable)
--- a/
git-annotate.perl
+++ b/
git-annotate.perl
@@
-10,9
+10,10
@@
use warnings;
use strict;
use Getopt::Long;
use POSIX qw(strftime gmtime);
use strict;
use Getopt::Long;
use POSIX qw(strftime gmtime);
+use File::Basename qw(basename dirname);
sub usage() {
sub usage() {
- print STDERR
'
Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ]
+ print STDERR
"
Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ]
-l, --long
Show long rev (Defaults off)
-t, --time
-l, --long
Show long rev (Defaults off)
-t, --time
@@
-23,7
+24,7
@@
sub usage() {
Use revs from revs-file instead of calling git-rev-list
-h, --help
This message.
Use revs from revs-file instead of calling git-rev-list
-h, --help
This message.
-
'
;
+
"
;
exit(1);
}
exit(1);
}
@@
-35,7
+36,7
@@
my $rc = GetOptions( "long|l" => \$longrev,
"help|h" => \$help,
"rename|r" => \$rename,
"rev-file|S=s" => \$rev_file);
"help|h" => \$help,
"rename|r" => \$rename,
"rev-file|S=s" => \$rev_file);
-if (!$rc or $help) {
+if (!$rc or $help
or !@ARGV
) {
usage();
}
usage();
}
@@
-208,6
+209,9
@@
sub find_parent_renames {
while (my $change = <$patch>) {
chomp $change;
my $filename = <$patch>;
while (my $change = <$patch>) {
chomp $change;
my $filename = <$patch>;
+ if (!defined $filename) {
+ next;
+ }
chomp $filename;
if ($change =~ m/^[AMD]$/ ) {
chomp $filename;
if ($change =~ m/^[AMD]$/ ) {