git_get_ref: Move to Dgit.pm and reimplement

Use
  git for-each-ref --format=%(objectname) [r]efs/whatever

This pattern won't match literally as a prefix because a ref name
cannot contain [, so it must match according to fnmatch.  whatever
cannot contain fnmatch metacharacters because they're not valid in ref
names.

This is a better idiom because it might directly look up the ref in
question (although currently it probably doesn't).

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index a270cd80836f1206d1033cb5441816dc9cd9f09c..32c2bc5673cad88ac87f1e569fa2a0518a5cf443 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
     @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
                       git_for_each_tag_referring is_fast_fwd
                       $package_re $component_re $deliberately_re
                       $branchprefix


@@ -205,6 +205,14 @@ sub git_for_each_ref ($$) {
     $!=0; $?=0; close GFER or die "$pattern $? $!";
 }
 
     $!=0; $?=0; close GFER or die "$pattern $? $!";
 }
 

+sub git_get_ref ($) {
+    # => '' if no such ref
+    my ($refname) = @_;
+    my $_ = $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);
 sub git_for_each_tag_referring ($$) {
     my ($objreferring, $func) = @_;
     # calls $func->($tagobjid,$refobjid,$fullrefname,$tagname);

diff --git a/dgit b/dgit
index 1e348f366858c775bb9a31bffb567fc513f03806..42f9f457332655cae0832baec4c03c4029fcad50 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -667,23 +667,6 @@ sub parsechangelog {
     return $c;
 }
 
     return $c;
 }
 

-sub git_get_ref ($) {
-    my ($refname) = @_;
-    my $got = cmdoutput_errok @git, qw(show-ref --), $refname;
-    if (!defined $got) {
-       $?==256 or fail "git show-ref failed (status $?)";
-       printdebug "ref $refname= [show-ref exited 1]\n";
-       return '';
-    }
-    if ($got =~ m/^(\w+) \Q$refname\E$/m) {
-       printdebug "ref $refname=$1\n";
-       return $1;
-    } else {
-       printdebug "ref $refname= [no match]\n";
-       return '';
-    }
-}
-

 sub must_getcwd () {
     my $d = getcwd();
     defined $d or fail "getcwd failed: $!";
 sub must_getcwd () {
     my $d = getcwd();
     defined $d or fail "getcwd failed: $!";