diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-17 09:18:12 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-17 09:18:12 +0100 |
commit | 2641d83f454808b2a97c32df5556c50da31660b3 (patch) | |
tree | d97be3b833a20649c4c162404b58344f0941b090 | |
parent | 33661147b03e60e4df5283ebd25df15f1619c623 (diff) |
fix push
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7e2b85f..0f2d67c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dgit (0.3~0.1) experimental; urgency=low + + * This version appears to be able to push. We still need to test + fetching a dgit-based upload... + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sat, 17 Aug 2013 09:18:04 +0100 + dgit (0.2) experimental; urgency=low * New version which might actually work but probably won't. @@ -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); } |