git-debrebase: merge: Actually record merge resolutions

[dgit.git] / tests / tests / gdr-merge-conflicts

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 420495a711ecb9736e7bfb338704c9119c40a8dc..12e7055aaa2f59f8daec382d885b6231af641b30 100755 (executable)
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -11,13 +11,19 @@ t-setup-import gdr-convert-gbp-noarchive
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
 wreckage-before () {
-       junkref=refs/debrebase-wreckage/junk
+       junkref=refs/debrebase/wreckage/junk
        git update-ref $junkref v2.1
 }
 
 wreckage-after () {
        test '' = "$(t-git-get-ref-exact $junkref)"
-       git for-each-ref refs/debrebase-wreckage | egrep .
+       git for-each-ref refs/debrebase/wreckage | egrep .
+}
+
+no-wreckage () {
+       if git for-each-ref refs/debrebase/wreckage | egrep .; then
+               fail wreckage
+       fi
 }
 
 : ----- prepare the baseline -----
@@ -77,7 +83,7 @@ git commit -m 'other-upstream-conflict' docs/README
 
 t-git-debrebase quick
 
-if git for-each-ref refs/debrebase-wreckage | egrep .; then fail wreck; fi
+no-wreckage
 
 : ----- make the merge -----
 
@@ -98,7 +104,7 @@ wreckage-after
 : ----- resolve the conflict -----
 
 # omg
-git checkout debrebase-wreckage/merged-patchqueue
+git checkout debrebase/wreckage/merged-patchqueue
 QUILT_PATCHES=debian/patches quilt push -a
 QUILT_PATCHES=debian/patches quilt refresh
 git add debian/patches
@@ -106,7 +112,6 @@ git commit -m FIX
 git reset --hard
 git clean -xdff
 
-t-expect-fail F:todo \
 t-git-debrebase record-resolved-merge
 
 git checkout master