diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-24 18:37:23 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-24 18:37:23 +0100 |
commit | fddfa627cb0ced08188eec1711039e4614a16de7 (patch) | |
tree | cc2e2044140a0762f239bd270e50f85d0b520db0 /dgit | |
parent | 284bf2a83349df4c867642257da14b0d303bbb5f (diff) |
Fix bug handling our synthetic merges when we see them in the remote suite branch.
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -591,12 +591,9 @@ Last allegedly pushed/uploaded: $oversion (newer or same) $later_warning_msg END $outputhash = $upload_hash; - } elsif ($outputhash ne $upload_hash) { - fail "version in archive ($cversion)". - " is same as version in git". - " to-be-uploaded (upload/) branch ($oversion)". - " but archive version hash no commit hash?!"; - } + } else { + $outputhash = $upload_hash; + } } chdir '../../../..' or die $!; runcmd @git, qw(update-ref -m),"dgit fetch import $cversion", |