summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-01 09:04:32 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-01 09:04:32 -0800
commit7ab2088255449e6336167295c4bc3e4a60126b41 (patch)
tree4377ed276fe20c29ed0367d66d249fcc85e9d451 /builtin
parentMerge branch 'es/myfirstcontrib-updates' (diff)
parentfetch.c: fix typo in a warning message (diff)
downloadtgif-7ab2088255449e6336167295c4bc3e4a60126b41.tar.xz
Merge branch 'rt/fetch-message-fix'
A small message update. * rt/fetch-message-fix: fetch.c: fix typo in a warning message
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fetch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 863c858fde..e8c0276d26 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1411,7 +1411,7 @@ static int do_fetch(struct transport *transport,
for (rm = ref_map; rm; rm = rm->next) {
if (!rm->peer_ref) {
if (source_ref) {
- warning(_("multiple branch detected, incompatible with --set-upstream"));
+ warning(_("multiple branches detected, incompatible with --set-upstream"));
goto skip;
} else {
source_ref = rm;