From 009315499e789d241998fcc5add1f109af8ba0e6 Mon Sep 17 00:00:00 2001 From: Martin Langhoff Date: Thu, 2 Mar 2006 17:24:30 +1300 Subject: [PATCH] annotate: fix -S parameter to take a string In the conversion to Getopt::Long, the -S / --rev-list parameter stopped working. We need to tell Getopt::Long that it is a string. As a bonus, the open() now does some useful error handling. Signed-off-by: Martin Langhoff Signed-off-by: Junio C Hamano --- git-annotate.perl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-annotate.perl b/git-annotate.perl index d6028c93c..cd476c762 100755 --- a/git-annotate.perl +++ b/git-annotate.perl @@ -31,7 +31,7 @@ our ($help, $longrev, $rename, $starting_rev, $rev_file) = (0, 0, 1); my $rc = GetOptions( "long|l" => \$longrev, "help|h" => \$help, "rename|r" => \$rename, - "rev-file|S" => \$rev_file); + "rev-file|S=s" => \$rev_file); if (!$rc or $help) { usage(); } @@ -174,7 +174,8 @@ sub git_rev_list { my $revlist; if ($rev_file) { - open($revlist, '<' . $rev_file); + open($revlist, '<' . $rev_file) + or die "Failed to open $rev_file : $!"; } else { $revlist = open_pipe("git-rev-list","--parents","--remove-empty",$rev,"--",$file) or die "Failed to exec git-rev-list: $!"; -- 2.26.2