diff options
-rwxr-xr-x | dgit | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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 { |