summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-17 09:18:12 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-17 09:18:12 +0100
commit2641d83f454808b2a97c32df5556c50da31660b3 (patch)
treed97be3b833a20649c4c162404b58344f0941b090 /dgit
parent33661147b03e60e4df5283ebd25df15f1619c623 (diff)
fix push
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index e4b1177..78b05f9 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);
}