git-debrebase: merge: Change wreckage to refs/debrebase/wreckage/*

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

diff --git a/git-debrebase b/git-debrebase
index a9abfa027ba332470af2de85eeba0da15dddf0e0..a4cafb64db92b993a0819029b848785d006f8e96 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -55,7 +55,7 @@ our ($opt_defaultcmd_interactive);
 
 our $us = qw(git-debrebase);
 
-our $wrecknoteprefix = 'refs/debrebase-wreckage';
+our $wrecknoteprefix = 'refs/debrebase/wreckage';
 
 $|=1;
 

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 420495a711ecb9736e7bfb338704c9119c40a8dc..59dec9720b18e0fb5fcbe6813f1a11da4c028386 100755 (executable)
--- 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