Provide dgit setup-new-tree (like dpkg-setup-mergechangelogs but only does it if...

[dgit.git] / dgit

diff --git a/dgit b/dgit
index a935cbfacb470e103ca0d05497ec2f44cdf908c2..d8a49dbc60351c60d3bee80e1b963b79b335e10f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1668,6 +1668,10 @@ sub setup_mergechangelogs (;$) {
     rename "$attrs.new", "$attrs" or die "$attrs: $!";
 }
 
+sub setup_new_tree () {
+    setup_mergechangelogs();
+}
+
 sub clone ($) {
     my ($dstdir) = @_;
     canonicalise_suite();
@@ -1697,7 +1701,7 @@ sub clone ($) {
        $vcsgiturl =~ s/\s+-b\s+\S+//g;
        runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }
-    setup_mergechangelogs();
+    setup_new_tree();
     runcmd @git, qw(reset --hard), lrref();
     printdone "ready for work in $dstdir";
 }
@@ -3027,6 +3031,11 @@ sub cmd_setup_mergechangelogs {
     setup_mergechangelogs(1);
 }
 
+sub cmd_setup_new_tree {
+    badusage "no arguments allowed to dgit setup-tree" if @ARGV;
+    setup_new_tree();
+}
+
 #---------- argument parsing and main program ----------
 
 sub cmd_version {