summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-08-10 19:11:57 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-08-11 00:09:29 +0100
commitd81b1debc1dc1ff0d123e3e4bc244b26592d1a52 (patch)
tree16b6b6ecddc3a3d7264d11d7cf69b98956648327
parenta4e8e4dbccd6fd64f7e31cf7527e9a8bd0bfe806 (diff)
dgit: Break out vcs_git_url_of_ctrl
This should have been done before. No functional change so far. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit12
1 files changed, 10 insertions, 2 deletions
diff --git a/dgit b/dgit
index 0775a7c..687ef64 100755
--- a/dgit
+++ b/dgit
@@ -3848,6 +3848,15 @@ END
printdone f_ "ready for work in %s", $dstdir;
}
+sub vcs_git_url_of_ctrl ($) {
+ my ($ctrl) = @_;
+ my $vcsgiturl = $ctrl->{'Vcs-Git'};
+ if (length $vcsgiturl) {
+ $vcsgiturl =~ s/\s+-b\s+\S+//g;
+ }
+ return $vcsgiturl;
+}
+
sub clone ($) {
# in multisuite, returns twice!
# once in parent after first suite fetched,
@@ -3886,9 +3895,8 @@ sub clone ($) {
progress __ "starting new git history";
}
fetch_from_archive() or no_such_package;
- my $vcsgiturl = $dsc->{'Vcs-Git'};
+ my $vcsgiturl = vcs_git_url_of_ctrl $dsc;
if (length $vcsgiturl) {
- $vcsgiturl =~ s/\s+-b\s+\S+//g;
runcmd @git, qw(remote add vcs-git), $vcsgiturl;
}
clone_finish($dstdir);