diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 01:21:43 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 11:56:34 +0100 |
| commit | 17474e7732a9a3fcba657bec60264c2629724d5e (patch) | |
| tree | 713af16479b182b7f8caeb2c7f778a2aea2ebd49 /tests | |
| parent | 11feba1f44552f3232c52f4f2a55ff7f2f0c6175 (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')
| -rw-r--r-- | tests/lib | 1 | ||||
| -rwxr-xr-x | tests/tests/gdr-subcommands | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -422,6 +422,7 @@ t-dgit () { {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \ ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \ + ${DGIT_GITDEBREBASE_TEST+--git-debrebase=}${DGIT_GITDEBREBASE_TEST} \ ${distro+${distro:+-d}}${distro--dtest-dummy} \ $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \ -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $t_dgit_xopts "$@" 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" |