Merge branch 'en/fetch-negotiation-default-fix'

[thirdparty/git.git] / builtin / fetch.c

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 5b3b18a72f59b5242aa9fd6ce74386c04389ecb7..6f5e157863923da28c6394cc86f359abb97f9e01 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1610,12 +1610,14 @@ static int do_fetch(struct transport *transport,
                 * don't care whether --tags was specified.
                 */
                if (rs->nr) {
-                       prune_refs(rs, ref_map, transport->url);
+                       retcode = prune_refs(rs, ref_map, transport->url);
                } else {
-                       prune_refs(&transport->remote->fetch,
-                                  ref_map,
-                                  transport->url);
+                       retcode = prune_refs(&transport->remote->fetch,
+                                            ref_map,
+                                            transport->url);
                }
+               if (retcode != 0)
+                       retcode = 1;
        }
        if (fetch_and_consume_refs(transport, ref_map, worktrees)) {
                free_refs(ref_map);
@@ -2052,7 +2054,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
        }
 
        if (negotiate_only && !negotiation_tip.nr)
-               die(_("--negotiate-only needs one or more --negotiate-tip=*"));
+               die(_("--negotiate-only needs one or more --negotiation-tip=*"));
 
        if (deepen_relative) {
                if (deepen_relative < 0)