From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Jul 2018 00:18:25 +0000 (+0100)
Subject: dgit: fetch: Reorganise cmd_fetch
X-Git-Tag: archive/debian/5.7~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8a52fe8f9f3fc66be492c54a19e2ba7890aa0557;p=dgit.git

dgit: fetch: Reorganise cmd_fetch

This slightly odd construction is actually how the return value from
fork_for_multisuite should be handled.  It now looks much more like
the calling pattern in pull().

No functional change: if $multi_fetched is falseish, we call
fetch_one, and then, no matter what, we finish 0.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 7242c782..5efcc5b1 100755
--- a/dgit
+++ b/dgit
@@ -4625,8 +4625,8 @@ sub cmd_fetch {
     parseopts();
     fetchpullargs();
     my $multi_fetched = fork_for_multisuite(sub { });
-    finish 0 if $multi_fetched;
-    fetch_one();
+    fetch_one() unless $multi_fetched; # parent
+    finish 0 if $multi_fetched eq '0'; # child
 }
 
 sub cmd_pull {