X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=941a14b93630d198172570a2a943d5ea29874d11;hb=e70717b64849f060a43f99e860ad49624ecdb9c0;hp=687ef646a4d4deb4569c039890cb54e22ea91bf7;hpb=d81b1debc1dc1ff0d123e3e4bc244b26592d1a52;p=dgit.git

diff --git a/dgit b/dgit
index 687ef646..941a14b9 100755
--- a/dgit
+++ b/dgit
@@ -3853,6 +3853,7 @@ sub vcs_git_url_of_ctrl ($) {
     my $vcsgiturl = $ctrl->{'Vcs-Git'};
     if (length $vcsgiturl) {
 	$vcsgiturl =~ s/\s+-b\s+\S+//g;
+	$vcsgiturl =~ s/\s+\[[^][]*\]//g;
     }
     return $vcsgiturl;
 }
@@ -4972,7 +4973,8 @@ sub cmd_update_vcs_git () {
 	get_archive_dsc();
 	$ctrl = $dsc;
     }
-    my $url = getfield $ctrl, 'Vcs-Git';
+    my $url = vcs_git_url_of_ctrl $ctrl;
+    fail 'no Vcs-Git header in control file' unless length $url;
 
     my @cmd;
     my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
@@ -4980,12 +4982,12 @@ sub cmd_update_vcs_git () {
 	print STDERR f_ "setting up vcs-git: %s\n", $url;
 	@cmd = (@git, qw(remote add vcs-git), $url);
     } elsif ($orgurl eq $url) {
-	print STDERR f_ "vcs git already configured: %s\n", $url;
+	print STDERR f_ "vcs git unchanged: %s\n", $url;
     } else {
 	print STDERR f_ "changing vcs-git url to: %s\n", $url;
 	@cmd = (@git, qw(remote set-url vcs-git), $url);
     }
-    runcmd_ordryrun_local @cmd;
+    runcmd_ordryrun_local @cmd if @cmd;
     if ($dofetch) {
 	print f_ "fetching (%s)\n", "@ARGV";
 	runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;