X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=78b05f9edcd3a7bd2d2e13f91aca7a3a2dd72ce8;hp=e4b1177dc23896b2389030e70e7a5a6bca0c2890;hb=d7aeeed4ce3bc05d015a84174dbfb237000d338a;hpb=33661147b03e60e4df5283ebd25df15f1619c623

diff --git a/dgit b/dgit
index e4b1177d..78b05f9e 100755
--- a/dgit
+++ b/dgit
@@ -431,7 +431,7 @@ sub rev_parse ($) {
 
 sub is_fast_fwd ($$) {
     my ($ancestor,$child) = @_;
-    my $mb = cmdoutput @git, qw(merge-base), $dsc_hash, $upload_hash;
+    my $mb = cmdoutput @git, qw(merge-base), $ancestor, $child;
     return rev_parse($mb) eq rev_parse($ancestor);
 }