From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Aug 2018 10:18:29 +0000 (+0100)
Subject: git-debrebase: Support --dgit option for finding dgit
X-Git-Tag: archive/debian/6.5~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=69aae724c3d05a20219e5a9642e162dd65ef2fe9

git-debrebase: Support --dgit option for finding dgit

Nothing uses this yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index eb0acb21..b51c7148 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -114,6 +114,7 @@ our $rd;
 our $workarea;
 
 our @git = qw(git);
+our @dgit = qw(dgit);
 
 sub in_workarea ($) {
     my ($sub) = @_;
@@ -1842,6 +1843,7 @@ getoptions_main
 	   'noop-ok', => \$opt_noop_ok,
 	   'f=s' => \@snag_force_opts,
 	   'anchor=s' => \@opt_anchors,
+	   '--dgit=s' => \($dgit[0]),
 	   'force!',
 	   '-i:s' => sub {
 	       my ($opt,$val) = @_;
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index db22fa5d..eb85c6c4 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -407,6 +407,12 @@ it is a snag if <commit-ish> is the anchor
 for the previous upstream version in
 git-debrebase new-upstream operations.
 
+=item --dgit=<program>
+
+Run <program>, instead of dgit from PATH,
+when invocation of dgit is necessary.
+This is provided mostly for the benefit of the test suite.
+
 =item -D
 
 Requests (more) debugging.  May be repeated.
diff --git a/tests/lib-gdr b/tests/lib-gdr
index 95d2330e..7b43d4f2 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -7,7 +7,7 @@ t-git-debrebase () {
 	local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-	$gdr	$GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
+	$gdr --dgit=$DGIT_TEST $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }