Honour --git= (mostly).

diff --git a/debian/changelog b/debian/changelog
index 34b9388e93bcfcd0616142ac6ba3868db1538aa3..d4cdd9deeba00654ebb305b8c53907095eb3084c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,7 @@ dgit (1.1~~) unstable; urgency=low
     before the actual header, so dgit works with https_proxy set (!)
   * When key to use not specified any other way, use the debian/changelog
     trailer line.  Closes:#793423.
+  * Honour --git= (mostly).
 
  --
 

diff --git a/dgit b/dgit
index 270f925a56a6ededa7fbf17bf8c754d46b87d042..b7c6d9acc74b293049b9c8b40f7657889450e8ec 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -91,13 +91,14 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'sbuild' => \@sbuild,
                      'ssh' => \@ssh,
                      'dgit' => \@dgit,
+                     'git' => \@git,
                      'dpkg-source' => \@dpkgsource,
                      'dpkg-buildpackage' => \@dpkgbuildpackage,
                      'dpkg-genchanges' => \@dpkggenchanges,
                      'ch' => \@changesopts,
                      'mergechanges' => \@mergechanges);
 
-our %opts_opt_cmdonly = ('gpg' => 1);
+our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
 our %opts_cfg_insertpos = map {
     $_,
     scalar @{ $opts_opt_map{$_} }

diff --git a/dgit.1 b/dgit.1
index dcf4408a4cccd38fec4d055db2d0225c73e0efad..d73d5b9f674506e07b2e5a7c1ed9a94a7c19e3e6 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -430,6 +430,7 @@ Specifies alternative programs to use instead of
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,
+.BR git ,
 or
 .BR mergechanges .
 
@@ -476,6 +477,10 @@ this applies only when the program is invoked directly by dgit.
 Usually, for passing options to dpkg-genchanges, you should use
 .BR --ch: \fIoption\fR.
 
+Specifying --git not effective for some lower-level read-only git
+operations performed by dgit, and also not when git is invoked by
+another program run by dgit.
+
 See notes above regarding ssh and dgit.
 
 NB that --gpg:option is not supported (because debsign does not