summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 17:45:28 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 18:32:56 +0100
commit436142c37d5a7925d6452651275382e935533e82 (patch)
tree3c7002b1d68d4b6fe53ed66166acd04ce70011b2 /dgit
parent013cc5ea30f13c2ea3be8851a34efe7fd6af2eae (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-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index a9fab5e..863104b 100755
--- a/dgit
+++ b/dgit
@@ -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);