Merge branch 'mw/alternates'

diff --git a/git-annotate.perl b/git-annotate.perl
index a7aab2566d67289f4abe57b0d91b9210f4263089..a6a7a482cdcf34e3a1d545c7d5deab599a7c0d2f 100755 (executable)
--- a/git-annotate.perl
+++ b/git-annotate.perl
@@ -10,9 +10,10 @@
 use strict;
 use Getopt::Long;
 use POSIX qw(strftime gmtime);
+use File::Basename qw(basename dirname);
 
 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
@@ -23,7 +24,7 @@ ()
                        Use revs from revs-file instead of calling git-rev-list
        -h, --help
                        This message.
-';
+";
 
        exit(1);
 }
@@ -35,7 +36,7 @@ ()
                        "help|h" => \$help,
                        "rename|r" => \$rename,
                        "rev-file|S=s" => \$rev_file);
-if (!$rc or $help) {
+if (!$rc or $help or !@ARGV) {
        usage();
 }