diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-04 01:16:19 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-04 01:28:04 +0100 |
commit | d86eda75da28ce5765d16bdc47d2cc88bb82a9fe (patch) | |
tree | 085b146e07debbeb6d0555c6dd1f5032a5574aa7 | |
parent | feaac744962e6aff55cdda2dbdfe4526ea751141 (diff) |
dgit: fetch: Slightly refactor pull()
When for_for_multisuite returns '0', meaning we are a child and should
do one suite, use finish 0 rather than returning, after doing the
fetch.
This has no functional change because the one call site is at the end
of cmd_pull, after which we finish 0 anyway.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3741,7 +3741,7 @@ END sub pull () { my $multi_fetched = fork_for_multisuite(sub { }); fetch_one() unless $multi_fetched; # parent - return if $multi_fetched eq '0'; # child + finish 0 if $multi_fetched eq '0'; # child runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]", lrref(); printdone "fetched to ".lrref()." and merged into HEAD"; |