From 436142c37d5a7925d6452651275382e935533e82 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 31 May 2015 17:45:28 +0100
Subject: 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.
---
 dgit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
cgit v1.2.3