diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-11-07 02:51:23 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-11-07 02:51:23 +0000 |
commit | d5f5e01951b405c645ee8c1aa497b0c6893e9da1 (patch) | |
tree | fb43e5486e617ba483d8c8986aef371d8536bbb1 /dgit | |
parent | 201e064fa7eb89ec1aacf265c4c07fef037c87d7 (diff) |
dgit: Move canonicalise_suite into fetch()
fetchpullargs has to run before we have dealt with multisuites, which
cannot be straightforwardly canonicalised.
Move the canonicalisation out of fetchpullargs. Previously,
fetchpullargs would always call canonicalise_suite if it wasn't going
to fail. In one of the cases it would print a message, but we have
just changed canonicalise_suite to print a message too, so the one
from fetchpullargs was redundant.
fetchpullargs is called right before fetch, in cmd_fetch; and, in
cmd_pull. In cmd_pull the split brain check intervenes between
fetchpullargs and pull which calls fetch. So overall there is now no
functional change other than the loss of the now-redundant message.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -3119,6 +3119,7 @@ sub clone ($) { } sub fetch () { + canonicalise_suite(); if (check_for_git()) { git_fetch_us(); } @@ -3902,11 +3903,8 @@ sub fetchpullargs () { my $clogp = parsechangelog(); $isuite = getfield $clogp, 'Distribution'; } - canonicalise_suite(); - progress "fetching from suite $csuite"; } elsif (@ARGV==1) { ($isuite) = @ARGV; - canonicalise_suite(); } else { badusage "incorrect arguments to dgit fetch or dgit pull"; } |