chiark / gitweb /
Move is_fast_fwd into Dgit.pm
[dgit.git] / dgit
diff --git a/dgit b/dgit
index c6a3596605fd9657c17f877ad8f7e733e902f8db..9b401a2291eb55c642a3effaf90058a62aff9339 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1271,18 +1271,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();
 }