From d83b380941520c668a712b0b936513373bd44278 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 21:13:57 +0100 Subject: git-debrebase: merge: Change wreckage to refs/debrebase/wreckage/* Signed-off-by: Ian Jackson --- tests/tests/gdr-merge-conflicts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/tests') diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 420495a..59dec97 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 -- cgit v1.2.3