From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 Oct 2016 23:06:37 +0000 (+0100)
Subject: Test suite: Do not fail when git requires --allow-unrelated-histories.
X-Git-Tag: archive/debian/2.0~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0c823e018f9092bb9d04cb0905970e02a23ea040

Test suite: Do not fail when git requires --allow-unrelated-histories.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index fc7d222a..aceac203 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -121,6 +121,7 @@ dgit (1.5~~) unstable; urgency=medium
   * tstunt arrangements: Fix mishandling of PERLLIB, etc.
   * tstunt-parsechangelog: Produce Timestamp field (like official one
     does, now).
+  * Do not fail when git requires --allow-unrelated-histories.
 
  --
 
diff --git a/tests/lib b/tests/lib
index 3294cdc0..b4642ae8 100644
--- a/tests/lib
+++ b/tests/lib
@@ -764,6 +764,18 @@ t-gbp-unapplied-pq2qc () {
 	git commit -m 'Commit patch queue'
 }
 
+t-git-pseudo-merge () {
+	# like   git merge -s ours
+	if [ ! "$git_pseuomerge_opts" ]; then
+		if git merge --help \
+		 | grep -q allow-unrelated-histories; then
+			git_pseuomerge_opts='--allow-unrelated-histories'
+		fi
+		git_pseuomerge_opts+=' -s ours'
+	fi
+	git merge $git_pseuomerge_opts "$@"
+}
+
 t-gbp-example-prep () {
 	t-tstunt-parsechangelog
 	t-archive example 1.0-1
@@ -785,7 +797,7 @@ t-gbp-example-prep () {
 
 	t-commit 'some updates' 1.0-2
 
-	git merge -s ours \
+	t-git-pseudo-merge \
 		-m 'Pseudo-merge to make descendant of archive' \
 		remotes/dgit/dgit/sid
 }