diff options
authorIan Jackson <>2017-02-12 22:20:46 +0000
committerIan Jackson <>2017-02-12 22:20:46 +0000
commit89e5f49c418e419c1572ed7428d5100c32127e64 (patch)
parent0476a4ac1e2e9c6658200a1d09c49080704f713b (diff)
dgit: --deliberately-not-fast-forward works properly in split view quilt modes (suppressing the pseudomerge).
3 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 9d192d2..4e44021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
dgit (4.0~) experimental; urgency=low
- *
+ * dgit: --deliberately-not-fast-forward works properly in
+ split view quilt modes (suppressing the pseudomerge).
diff --git a/dgit b/dgit
index 6b1201e..caa2d75 100755
--- a/dgit
+++ b/dgit
@@ -3891,6 +3891,7 @@ sub splitbrain_pseudomerge ($$$$) {
return $dgitview unless defined $archive_hash;
+ return $dgitview if deliberately_not_fast_forward();
printdebug "splitbrain_pseudomerge...\n";
diff --git a/dgit.1 b/dgit.1
index e5b4bb0..2233d95 100644
--- a/dgit.1
+++ b/dgit.1
@@ -554,6 +554,17 @@ Declare that you are deliberately rewinding history. When pushing to
Debian, use this when you are making a renewed upload of an entirely
new source package whose previous version was not accepted for release
from NEW because of problems with copyright or redistributibility.
+In split view quilt modes,
+this also prevents the construction by dgit of a pseudomerge
+to make the dgit view fast forwarding.
+Normally only one of
+--overwrite (which creates a suitable pseudomerge)
+(which suppresses the pseudomerge and the fast forward checks)
+should be needed;
+--overwrite is usually better.
.BR --deliberately-include-questionable-history
Declare that you are deliberately including, in the git history of