From 66d6b40a1474ef84fe0e4a68bd7428f5ab1b0e31 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Jul 2018 01:21:43 +0100
Subject: [PATCH] dgit: fetch: Introduce new dofetch()

This actually does all that is needed.  It replaces two now-identical
calling patterns.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dgit b/dgit
index 5efcc5b1..c7336ddd 100755
--- a/dgit
+++ b/dgit
@@ -3738,10 +3738,14 @@ END
     printdone "fetched into ".lrref();
 }
 
-sub pull () {
+sub dofetch () {
     my $multi_fetched = fork_for_multisuite(sub { });
     fetch_one() unless $multi_fetched; # parent
     finish 0 if $multi_fetched eq '0'; # child
+}
+
+sub pull () {
+    dofetch();
     runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
         lrref();
     printdone "fetched to ".lrref()." and merged into HEAD";
@@ -4624,9 +4628,7 @@ sub fetchpullargs () {
 sub cmd_fetch {
     parseopts();
     fetchpullargs();
-    my $multi_fetched = fork_for_multisuite(sub { });
-    fetch_one() unless $multi_fetched; # parent
-    finish 0 if $multi_fetched eq '0'; # child
+    dofetch();
 }
 
 sub cmd_pull {
-- 
2.30.2