Dgit.pm: changedir: Break out from dgit

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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 1f9c8276257b8999e8a28075511fca6fea89a544..e25a3af8339b4a659eff47fa4de9e42f871cd26f 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -59,7 +59,7 @@ BEGIN {
                       $debugprefix *debuglevel *DEBUG
                       shellquote printcmd messagequote
                       $negate_harmful_gitattrs
-                     git_slurp_config_src
+                     changedir git_slurp_config_src
                      workarea_setup
                      fresh_workarea in_workarea);
     # implicitly uses $main::us
@@ -420,6 +420,12 @@ sub is_fast_fwd ($$) {
     }
 }
 
+sub changedir ($) {
+    my ($newdir) = @_;
+    printdebug "CD $newdir\n";
+    chdir $newdir or confess "chdir: $newdir: $!";
+}
+
 sub git_slurp_config_src ($) {
     my ($src) = @_;
     # returns $r such that $r->{KEY}[] = VALUE

diff --git a/dgit b/dgit
index 4b19384184b9f866890c0039e6c5b6403b1324cc..28795fec9f5a130bf530da26bb323863281391e6 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -249,12 +249,6 @@ sub no_such_package () {
     exit 4;
 }
 
-sub changedir ($) {
-    my ($newdir) = @_;
-    printdebug "CD $newdir\n";
-    chdir $newdir or confess "chdir: $newdir: $!";
-}
-
 sub deliberately ($) {
     my ($enquiry) = @_;
     return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;