diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 21:13:57 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:41:17 +0100 |
| commit | d83b380941520c668a712b0b936513373bd44278 (patch) | |
| tree | e4251d39627f3113aa27e9c4b931631bebdb2b05 /tests | |
| parent | 268663da0b2726d94d54f95299ed2c4a0bd7351b (diff) | |
git-debrebase: merge: Change wreckage to refs/debrebase/wreckage/*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 8 |
1 files changed, 4 insertions, 4 deletions
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 |