From 4cb451aa46ad449116f9ff0d1a4450e6dcc01d4f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 15:13:24 +0000
Subject: git-debrebase: test suite: introduce t-some-changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 tests/lib-gdr         | 17 +++++++++++++++++
 tests/tests/gdr-edits | 13 +------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/tests/lib-gdr b/tests/lib-gdr
index f633307..4cfa62b 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -88,3 +88,20 @@ t-gdr-branch-structure () {
 
 	done
 }
+
+t-some-changes () {
+	local token=$1
+
+	echo >>debian/zorkmid "// debian $token"
+	git add debian/zorkmid
+	git commit -m "DEBIAN add zorkmid ($token)"
+
+	echo >>src.c "// upstream $token"
+	git commit -a -m "UPSTREAM edit src.c ($token)"
+
+	for f in debian/zorkmid src.c; do
+		echo "// both! $token" >>$f
+		git add $f
+	done
+	git commit -m "MIXED add both ($token)"
+}
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 3efd063..cff33b1 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -14,18 +14,7 @@ t-dch-commit -v $v -m testing
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
 
-echo >>debian/zorkmid '// debian'
-git add debian/zorkmid
-git commit -m 'DEBIAN add zorkmid'
-
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
-
-for f in debian/zorkmid src.c; do
-	echo '// both!' >>$f
-	git add $f
-done
-git commit -m 'MIXED add boths'
+t-some-changes edits
 
 t-dch-commit -r sid
 
-- 
cgit v1.2.3