diff options
| -rwxr-xr-x | git-debrebase | 2 | ||||
| -rw-r--r-- | git-debrebase.1.pod | 6 | ||||
| -rw-r--r-- | tests/lib-gdr | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index eb0acb2..b51c714 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 db22fa5..eb85c6c 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 95d2330..7b43d4f 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 "$@" : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} ' } |