Avoid use of "my $_", which is not portable

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index c2b7f670012ee2293ac57b72ce36b683f4c2c26f..37cbc51b68e52116705d1988cf040eef36919bda 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -18,7 +18,7 @@ BEGIN {
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists fail ensuredir waitstatusmsg failedcmd
                       cmdoutput cmdoutput_errok
-                      git_rev_parse git_for_each_ref
+                      git_rev_parse git_get_ref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
                       $package_re $component_re $deliberately_re
                       $branchprefix
@@ -188,23 +188,34 @@ sub git_rev_parse ($) {
     return cmdoutput qw(git rev-parse), "$_[0]~0";
 }
 
-sub git_for_each_ref ($$) {
-    my ($pattern,$func) = @_;
+sub git_for_each_ref ($$;$) {
+    my ($pattern,$func,$gitdir) = @_;
     # calls $func->($objid,$objtype,$fullrefname,$reftail);
-    # $reftail is RHS of ref after refs/\w+/
+    # $reftail is RHS of ref after refs/[^/]+/
     # breaks if $pattern matches any ref `refs/blah' where blah has no `/'
     my @cmd = (qw(git for-each-ref), $pattern);
+    if (defined $gitdir) {
+       @cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd);
+    }
     open GFER, "-|", @cmd or die $!;
     debugcmd "|", @cmd;
     while (<GFER>) {
        chomp or die "$_ ?";
        printdebug "|> ", $_, "\n";
-       m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))$# or die "$_ ?";
+       m#^(\w+)\s+(\w+)\s+(refs/[^/]+/(\S+))$# or die "$_ ?";
        $func->($1,$2,$3,$4);
     }
     $!=0; $?=0; close GFER or die "$pattern $? $!";
 }
 
+sub git_get_ref ($) {
+    # => '' if no such ref
+    my ($refname) = @_;
+    local $_ = $refname;
+    s{^refs/}{[r]efs/} or die "$refname $_ ?";
+    return cmdoutput qw(git for-each-ref --format=%(objectname)), $_;
+}
+
 sub git_for_each_tag_referring ($$) {
     my ($objreferring, $func) = @_;
     # calls $func->($tagobjid,$refobjid,$fullrefname,$tagname);