diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 21:57:09 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:41:46 +0100 |
| commit | bab4f09f510a6af03210b40215bae6f1cf2c3179 (patch) | |
| tree | d87dace84c898c355b851d9e87479a2bede14bcc /tests | |
| parent | d83b380941520c668a712b0b936513373bd44278 (diff) | |
git-debrebase: merge: test conflict: Break out no-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, 7 insertions, 1 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 59dec97..f0abea7 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -20,6 +20,12 @@ wreckage-after () { 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 ----- cd $p @@ -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 ----- |