dgit: update-vcs-git: Do not crash if url is unchanged

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 9d4e78e18c2907ea47433cdd83982cedac5c3750..3ac042cdd3052831aa611f006f72b04a8b51c609 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -987,7 +987,7 @@ sub reflog_cache_lookup ($$) {
 #    changedir playground
 #    changedir $maindir
 #
-#    playtree_setup $local_git_cfg
+#    playtree_setup
 #            # ^ call in some (perhaps trivial) subdir of playground
 #
 #    rmtree playground
@@ -1046,9 +1046,7 @@ sub fresh_playground ($) {
 
 # ----- playtrees -----
 
-sub playtree_setup (;$) {
-    my ($t_local_git_cfg) = @_;
-    $t_local_git_cfg //= $local_git_cfg;
+sub playtree_setup () {
     # for use in the playtree
     # $maindir must be set, eg by calling record_maindir or fresh_playground
     # this is confusing: we have
@@ -1057,7 +1055,7 @@ sub playtree_setup (;$) {
     #   $maindir_gitdir     contains our main working "dgit", HEAD, etc.
     #   $maindir_gitcommon  the shared stuff, including .objects
 
-    # we need to invoke git-playtree-create via git because
+    # we need to invoke git-playtree-setup via git because
     # there may be config options it needs which are only available
     # to us, sensibly, in @git
 
@@ -1068,7 +1066,7 @@ sub playtree_setup (;$) {
     # @INC is conveniently available.
     my $newpath = join ':', +(grep { !m/:/ } @INC),
                  '/usr/share/dgit', $ENV{PATH};
-    runcmd qw(env), "PATH=$newpath", @git, qw(playtree-create .);
+    runcmd qw(env), "PATH=$newpath", @git, qw(playtree-setup .);
 
     ensuredir '.git/info';
     open GA, "> .git/info/attributes" or confess "$!";