X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=59dec9720b18e0fb5fcbe6813f1a11da4c028386;hp=420495a711ecb9736e7bfb338704c9119c40a8dc;hb=d83b380941520c668a712b0b936513373bd44278;hpb=268663da0b2726d94d54f95299ed2c4a0bd7351b

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 420495a7..59dec972 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -11,13 +11,13 @@ 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 .
 }
 
 : ----- prepare the baseline -----
@@ -77,7 +77,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
+if git for-each-ref refs/debrebase/wreckage | egrep .; then fail wreck; fi
 
 : ----- make the merge -----
 
@@ -98,7 +98,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