From 89e5f49c418e419c1572ed7428d5100c32127e64 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 12 Feb 2017 22:20:46 +0000 Subject: [PATCH 1/1] dgit: --deliberately-not-fast-forward works properly in split view quilt modes (suppressing the pseudomerge). --- debian/changelog | 3 ++- dgit | 1 + dgit.1 | 11 +++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9d192d27..4e440216 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 6b1201e7..caa2d75c 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 e5b4bb05..2233d959 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) +and +--deliberately-not-fast-forward +(which suppresses the pseudomerge and the fast forward checks) +should be needed; +--overwrite is usually better. .TP .BR --deliberately-include-questionable-history Declare that you are deliberately including, in the git history of -- 2.30.2