don't mention dgit in our synthetic commit message

[dgit.git] / dgit

diff --git a/dgit b/dgit
index e4b1177dc23896b2389030e70e7a5a6bca0c2890..b0795627e2acddb7f9e4bc72a8eacb96333323d6 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -369,7 +369,7 @@ committer $authline
 
 $clogp->{Changes}
 
-# imported by dgit from the archive
+# imported from the archive
 END
     close C or die $!;
     my $commithash = cmdoutput @git, qw(hash-object -w -t commit ../commit.tmp);
@@ -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);
 }