From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 23 Jan 2017 16:17:23 +0000 (+0000)
Subject: config and suite handling: Make dgit-setup-* work in default distro.
X-Git-Tag: archive/debian/3.8~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ddb80a1e2625561a6241b76646c173b4d738c705;hp=c8f9e9be604c623745f2218f9a1deed5c65dacbe

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 924e2d79..35969725 100644
--- 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 cf27bb7c..8e7f2391 100755
--- 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();
 }