diff options
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 28 |
1 files changed, 18 insertions, 10 deletions
@@ -358,6 +358,23 @@ 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 $?)"; + print DEBUG "ref $refname= [show-ref exited 1]\n"; + return ''; + } + if ($got =~ m/^(\w+) \Q$refname\E$/m) { + print DEBUG "ref $refname=$1\n"; + return $1; + } else { + print DEBUG "ref $refname= [no match]\n"; + return ''; + } +} + our %rmad; sub archive_query ($) { @@ -724,16 +741,7 @@ sub fetch_from_archive () { print "no version available from the archive\n"; } - my $lrref_fn = ".git/".lrref(); - if (open H, $lrref_fn) { - $lastpush_hash = <H>; - chomp $lastpush_hash; - die "$lrref_fn $lastpush_hash ?" unless $lastpush_hash =~ m/^\w+$/; - } elsif ($! == &ENOENT) { - $lastpush_hash = ''; - } else { - die "$lrref_fn $!"; - } + $lastpush_hash = git_get_ref(lrref()); print DEBUG "previous reference hash=$lastpush_hash\n"; my $hash; if (defined $dsc_hash) { |