summaryrefslogtreecommitdiff
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
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>
-rwxr-xr-xdgit2
-rw-r--r--dgit.12
-rw-r--r--tests/lib1
-rwxr-xr-xtests/tests/gdr-subcommands3
4 files changed, 7 insertions, 1 deletions
diff --git a/dgit b/dgit
index dc42359..c8567ed 100755
--- a/dgit
+++ b/dgit
@@ -117,6 +117,7 @@ our (@gpg) = qw(gpg);
our (@sbuild) = qw(sbuild);
our (@ssh) = 'ssh';
our (@dgit) = qw(dgit);
+our (@git_debrebase) = qw(git-debrebase);
our (@aptget) = qw(apt-get);
our (@aptcache) = qw(apt-cache);
our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
@@ -136,6 +137,7 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
'ssh' => \@ssh,
'dgit' => \@dgit,
'git' => \@git,
+ 'git-debrebase' => \@git_debrebase,
'apt-get' => \@aptget,
'apt-cache' => \@aptcache,
'dpkg-source' => \@dpkgsource,
diff --git a/dgit.1 b/dgit.1
index 6d46b20..2705d62 100644
--- a/dgit.1
+++ b/dgit.1
@@ -825,6 +825,7 @@ Specifies a single additional option to pass to
.BR sbuild ,
.BR ssh ,
.BR dgit ,
+.BR git-debrebase ,
.BR apt-get ,
.BR apt-cache ,
.BR gbp-pq ,
@@ -872,6 +873,7 @@ Specifies alternative programs to use instead of
.BR gpg ,
.BR ssh ,
.BR dgit ,
+.BR git-debrebase ,
.BR apt-get ,
.BR apt-cache ,
.BR git ,
diff --git a/tests/lib b/tests/lib
index 8722522..bc9e8c7 100644
--- a/tests/lib
+++ b/tests/lib
@@ -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"