config and suite handling: Make dgit-setup-* work in default distro.

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

diff --git a/debian/changelog b/debian/changelog
index 924e2d79aa19aaef95c7e5c050d48c028d7dd04c..35969725c38e8ef92f59ad5655f8bddb48c20180 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (3.8~) unstable; urgency=medium
 
-  * 
+  Bugfixes:
+  * Make dgit-setup-* work in default distro.
 
  --
 

diff --git a/dgit b/dgit
index cf27bb7c848b5379a03f836721c8ebf83cf4cc63..8e7f2391adff56bc84898b8d70d2a31ca9e4938d 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6338,21 +6338,25 @@ sub cmd_print_dgit_repos_server_source_url {
 
 sub cmd_setup_mergechangelogs {
     badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    local $isuite = 'DGIT-SETUP-TREE';
     setup_mergechangelogs(1);
 }
 
 sub cmd_setup_useremail {
     badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
+    local $isuite = 'DGIT-SETUP-TREE';
     setup_useremail(1);
 }
 
 sub cmd_setup_gitattributes {
     badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
+    local $isuite = 'DGIT-SETUP-TREE';
     setup_gitattrs(1);
 }
 
 sub cmd_setup_new_tree {
     badusage "no arguments allowed to dgit setup-tree" if @ARGV;
+    local $isuite = 'DGIT-SETUP-TREE';
     setup_new_tree();
 }