X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-subcommands;h=e59fc07aaeab6ada1e0a510e3be9ff8b3027d299;hp=982515685145b6db685d5cb804163e0be344ce6f;hb=f7e37ea9f83b46c5efa4152b36c6cc0f4b91fadd;hpb=2f538edde0ceb8dc747dd481e2e80ab2f36555d7 diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands index 98251568..e59fc07a 100755 --- a/tests/tests/gdr-subcommands +++ b/tests/tests/gdr-subcommands @@ -2,7 +2,7 @@ set -e . tests/lib -t-dependencies git-buildpackage libfile-fnmatch-perl faketime +t-dependencies GDR t-setup-import gdr-convert-gbp @@ -16,7 +16,8 @@ mix-it () { local m=$(git symbolic-ref HEAD) t-some-changes "subcommands $m 1" - t-dgit -wgf quilt-fixup + # we want patches mde by dgit, not gdr, for our test cases + t-dgit --git-debrebase=true -wgf quilt-fixup t-git-next-date t-some-changes "subcommands $m 2"