diff options
Diffstat (limited to 'tests/tests/gdr-fresh')
| -rwxr-xr-x | tests/tests/gdr-fresh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/tests/gdr-fresh b/tests/tests/gdr-fresh index 169181c..642aacc 100755 --- a/tests/tests/gdr-fresh +++ b/tests/tests/gdr-fresh @@ -25,21 +25,22 @@ git commit -m 'initial debianisation' t-make-orig example 1.0 -dgit-quilt-fixup-uses-gdr () { +dgit-quilt-fixup-uses-dgit-linear () { t-git-next-date DGIT_TEST_DEBUG=-DD t-dgit quilt-fixup 2>&1 |tee ../fixup.out - grep '^branch_is_gdr .* YES$' ../fixup.out + grep '^branch_is_gdr .* unmarked BreakwaterStart NO$' ../fixup.out + + t-dgit --quilt=nofix quilt-fixup } -dgit-quilt-fixup-uses-gdr +dgit-quilt-fixup-uses-dgit-linear git checkout --detach patch-queue/quilt-tip git rebase master git push . HEAD:master git checkout master -dgit-quilt-fixup-uses-gdr -t-gdr-made-patches +dgit-quilt-fixup-uses-dgit-linear t-ok |