chiark / gitweb /
docs changes
[dgit.git] / dgit
diff --git a/dgit b/dgit
index e4b1177dc23896b2389030e70e7a5a6bca0c2890..78b05f9edcd3a7bd2d2e13f91aca7a3a2dd72ce8 100755 (executable)
--- 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);
 }