Dgit.pm: Provide @git

This clears the way for some parts of Dgit.pm to honour dgit's
git invocation conventions.

No functional change.

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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 4f9aac925076789129958d4d4455fc63b400250e..3f1d1b7bee630ddaca0d5dd52522e52f2b8f828b 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -56,6 +56,7 @@ BEGIN {
                       waitstatusmsg failedcmd_waitstatus
                      failedcmd_report_cmd failedcmd
                       runcmd shell_cmd cmdoutput cmdoutput_errok
+                     @git
                       git_rev_parse changedir_git_toplevel git_cat_file
                      git_get_ref git_get_symref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
@@ -113,6 +114,8 @@ our $gdrlast_refprefix = 'debrebase-last';
 our $printdebug_when_debuglevel = 1;
 our $debugcmd_when_debuglevel = 1;
 
+our (@git) = qw(git);
+
 # these three all go together, only valid after record_maindir
 our $maindir;
 our $maindir_gitdir;

diff --git a/dgit b/dgit
index 0e0ff6575c3e79bc67227b809e36c876b53fb4f1..ed8bbeb812c610d5935c001ce8678324c040ba99 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -117,7 +117,6 @@ our $rewritemap = 'dgit-rewrite/map';
 
 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
 
-our (@git) = qw(git);
 our (@dget) = qw(dget);
 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
 our (@dput) = qw(dput);

diff --git a/git-debrebase b/git-debrebase
index 70b00608b3b9e7a980c830ec777839f20f23cbf5..06f56d872abe5bcf98a966ae61bf2d2080a7a49a 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -121,7 +121,6 @@ our $playprefix = 'debrebase';
 our $rd;
 our $workarea;
 
-our @git = qw(git);
 our @dgit = qw(dgit);
 
 sub in_workarea ($) {