git-debrebase: merge: test: Introduce t-merge-conflicted-*

NFC

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

diff --git a/tests/lib b/tests/lib
index 6028133a21b38bd6518e0bc7bad1471581ca25be..e2496b43a0355d45f67fc345622df66705c8de33 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -1025,6 +1025,18 @@ t-make-badcommit () {
        t-expect-fsck-fail $badcommit
 }
 
+t-merge-conflicted-stripping-conflict-markers () {
+       local otherbranch=$1
+       local file=$2
+
+       t-expect-fail F:"Merge conflict in $file" \
+       git merge $otherbranch
+
+       perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' "$file"
+       git add "$file"
+       git commit --no-edit
+}
+
 t-commit () {
        local msg=$1
        v=${2:-${majorv:-1}.$revision}

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index b1a215a4890e8241e67693c8a018a10592974729..60146913f93e6d84d26e4d3590145c29584ecd39 100755 (executable)
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -32,13 +32,7 @@ echo 'us-conflict' >>debian/zorkmid
 git commit -m 'us-conflict' debian/zorkmid
 t-git-debrebase quick
 
-t-expect-fail E:'Merge conflict in debian/zorkmid' \
-git merge other
-
-perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid
-
-git add debian/zorkmid
-git commit --no-edit
+t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
 
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase