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>

diff --git a/dgit b/dgit
index dc423592e2b7b673c802158522416f8c269fc82b..c8567ed473d838cab555bfd5c118a7d695eb4bef 100755 (executable)
--- 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 6d46b20a4c7887158a567a89f90a82db53176e0a..2705d624f419e8f86a7af5f5438653224cb479a2 100644 (file)
--- 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 8722522daeed3856a6497e1a92552f6646c62c6a..bc9e8c72fdc673f77b2d97a1c55ebfaf0d081c87 100644 (file)
--- 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 982515685145b6db685d5cb804163e0be344ce6f..0d5a30bd3c7ce05a43f7ec6d3be3c2333a01037e 100755 (executable)
--- 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"