summaryrefslogtreecommitdiff
path: root/builtin-remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-10 08:52:24 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-10 08:52:24 -0800
commit7f695d262a67e1d8d970d92fe84579b6609bca96 (patch)
tree3e13272a64cd1418685db4ede0fc0e46210766b3 /builtin-remote.c
parent2b35fccf734ab1d30828d95ea34f1755d9183365 (diff)
parent4f2e842dd0046a12bd82bb2b5aa066c686dc3f44 (diff)
downloadgit-7f695d262a67e1d8d970d92fe84579b6609bca96.tar.gz
Merge branch 'bg/maint-remote-update-default'
* bg/maint-remote-update-default: Fix "git remote update" with remotes.defalt set
Diffstat (limited to 'builtin-remote.c')
-rw-r--r--builtin-remote.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/builtin-remote.c b/builtin-remote.c
index a5019397ff..c4945b8708 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -1238,13 +1238,11 @@ static int update(int argc, const char **argv)
fetch_argv[fetch_argc++] = "--prune";
if (verbose)
fetch_argv[fetch_argc++] = "-v";
- if (argc < 2) {
+ fetch_argv[fetch_argc++] = "--multiple";
+ if (argc < 2)
fetch_argv[fetch_argc++] = "default";
- } else {
- fetch_argv[fetch_argc++] = "--multiple";
- for (i = 1; i < argc; i++)
- fetch_argv[fetch_argc++] = argv[i];
- }
+ for (i = 1; i < argc; i++)
+ fetch_argv[fetch_argc++] = argv[i];
if (strcmp(fetch_argv[fetch_argc-1], "default") == 0) {
git_config(get_remote_default, &default_defined);