summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-04 01:12:52 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-04 01:28:04 +0100
commitfeaac744962e6aff55cdda2dbdfe4526ea751141 (patch)
treebff03b619c70f67d84ed8b3a45aa869694a3bcbe
parent441a1663d98b29d735e2d9392a5cfc84d7cf00f0 (diff)
dgit: fetch: Rename fetch_one from fetch (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit8
1 files changed, 4 insertions, 4 deletions
diff --git a/dgit b/dgit
index 404eab9..5802a21 100755
--- a/dgit
+++ b/dgit
@@ -3557,7 +3557,7 @@ sub fork_for_multisuite ($) {
my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
sub {
@end = ();
- fetch();
+ fetch_one();
finish 0;
});
# xxx collecte the ref here
@@ -3715,7 +3715,7 @@ sub clone ($) {
clone_finish($dstdir);
}
-sub fetch () {
+sub fetch_one () {
canonicalise_suite();
if (check_for_git()) {
git_fetch_us();
@@ -3740,7 +3740,7 @@ END
sub pull () {
my $multi_fetched = fork_for_multisuite(sub { });
- fetch() unless $multi_fetched; # parent
+ fetch_one() unless $multi_fetched; # parent
return if $multi_fetched eq '0'; # child
runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
lrref();
@@ -4626,7 +4626,7 @@ sub cmd_fetch {
fetchpullargs();
my $multi_fetched = fork_for_multisuite(sub { });
finish 0 if $multi_fetched;
- fetch();
+ fetch_one();
}
sub cmd_pull {