diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 17:45:28 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 18:32:56 +0100 |
commit | 436142c37d5a7925d6452651275382e935533e82 (patch) | |
tree | 3c7002b1d68d4b6fe53ed66166acd04ce70011b2 /dgit | |
parent | 013cc5ea30f13c2ea3be8851a34efe7fd6af2eae (diff) |
dgit: Gate sending "previously" on deliberately_not_fast_forward not $forceflag
$forceflag will only be set if we actually think the ref is not fast
forwarding. But the --deliberately flags may cause a repo reset which
will require us to mention the previous state, even if the push
appears to be ff.
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1661,7 +1661,7 @@ sub dopush ($) { responder_send_command("param head $head"); responder_send_command("param csuite $csuite"); - if ($forceflag) { + if (deliberately_not_fast_forward) { git_for_each_ref(lrfetchrefs, sub { my ($objid,$objtype,$lrfetchrefname,$reftail) = @_; my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1); |