mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

annotate: fix -S parameter to take a string

Browse Source 
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 <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Martin Langhoff
2006-03-02 17:24:30 +13:00
committed by Junio C Hamano
parent 7c3ecb65ee
commit 009315499e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git-annotate.perl
View File

@ -31,7 +31,7 @@ our ($help, $longrev, $rename, $starting_rev, $rev_file) = (0, 0, 1);
my $rc = GetOptions( "long|l" => \$longrev, my $rc = GetOptions( "long|l" => \$longrev,
"help|h" => \$help, "help|h" => \$help,
"rename|r" => \$rename, "rename|r" => \$rename,
"rev-file|S" => \$rev_file); "rev-file|S=s" => \$rev_file);
if (!$rc or $help) { if (!$rc or $help) {
usage(); usage();
} }
@ -174,7 +174,8 @@ sub git_rev_list {
my $revlist; my $revlist;
if ($rev_file) { if ($rev_file) {
open($revlist, '<' . $rev_file); open($revlist, '<' . $rev_file)
or die "Failed to open $rev_file : $!";
} else { } else {
$revlist = open_pipe("git-rev-list","--parents","--remove-empty",$rev,"--",$file) $revlist = open_pipe("git-rev-list","--parents","--remove-empty",$rev,"--",$file)
or die "Failed to exec git-rev-list: $!"; or die "Failed to exec git-rev-list: $!";