X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=42f9f457332655cae0832baec4c03c4029fcad50;hp=c6a3596605fd9657c17f877ad8f7e733e902f8db;hb=0c838feda384f115a115ddd609eca9b8c6ece162;hpb=d3009c4371f9209cd6745caa5e422355ac6692a7

diff --git a/dgit b/dgit
index c6a35966..42f9f457 100755
--- a/dgit
+++ b/dgit
@@ -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: $!";
@@ -1271,18 +1254,6 @@ sub ensure_we_have_orig () {
     }
 }
 
-sub is_fast_fwd ($$) {
-    my ($ancestor,$child) = @_;
-    my @cmd = (@git, qw(merge-base), $ancestor, $child);
-    my $mb = cmdoutput_errok @cmd;
-    if (defined $mb) {
-	return git_rev_parse($mb) eq git_rev_parse($ancestor);
-    } else {
-	$?==256 or failedcmd @cmd;
-	return 0;
-    }
-}
-
 sub git_fetch_us () {
     runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
 }
@@ -1679,7 +1650,7 @@ sub dopush ($) {
 
     if ($forceflag && defined $lastpush_hash) {
 	git_for_each_tag_referring($lastpush_hash, sub {
-	    my ($objid,$fullrefname,$tagname) = @_;
+	    my ($objid,$refobjid,$fullrefname,$tagname) = @_;
 	    responder_send_command("supersedes $fullrefname=$objid");
 	    $supersedes{$fullrefname} = $objid;
 	});