summaryrefslogtreecommitdiff
path: root/tests/tests/gdr-subcommands
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-17 01:21:43 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-17 11:56:34 +0100
commit17474e7732a9a3fcba657bec60264c2629724d5e (patch)
tree713af16479b182b7f8caeb2c7f778a2aea2ebd49 /tests/tests/gdr-subcommands
parent11feba1f44552f3232c52f4f2a55ff7f2f0c6175 (diff)
dgit: Prepare for calling git-debrebase
Provide the --git-debrebase= option, and pass it in the test suite. Nothing uses this yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/gdr-subcommands')
-rwxr-xr-xtests/tests/gdr-subcommands3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index 9825156..0d5a30b 100755
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -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"