diff options
| -rw-r--r-- | Debian/Dgit.pm | 10 | ||||
| -rwxr-xr-x | dgit | 17 |
2 files changed, 9 insertions, 18 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index a270cd8..32c2bc5 100644 --- 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 @@ -205,6 +205,14 @@ sub git_for_each_ref ($$) { $!=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); @@ -667,23 +667,6 @@ sub parsechangelog { 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: $!"; |