Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint

diff --git a/transport.c b/transport.c
index 41eb82c6f3f4de956225eb8afd65d0684be68eec..94d6dc3725a2bb091df66ce6fe266ddd5317ed02 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -59,7 +59,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
                                localname + 11, transport->remote->name,
                                remotename);
                else
-                       printf("Would set upstream of '%s' to '%s' of '%s'\n",
+                       printf(_("Would set upstream of '%s' to '%s' of '%s'\n"),
                                localname + 11, remotename + 11,
                                transport->remote->name);
        }
@@ -148,7 +148,7 @@ static int set_git_option(struct git_transport_options *opts,
                        char *end;
                        opts->depth = strtol(value, &end, 0);
                        if (*end)
-                               die("transport: invalid depth option '%s'", value);
+                               die(_("transport: invalid depth option '%s'"), value);
                }
                return 0;
        }
@@ -510,6 +510,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
        args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
        args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);
        args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC);
+       args.push_options = transport->push_options;
        args.url = transport->url;
 
        if (flags & TRANSPORT_PUSH_CERT_ALWAYS)
@@ -563,7 +564,7 @@ void transport_take_over(struct transport *transport,
        struct git_transport_data *data;
 
        if (!transport->smart_options)
-               die("Bug detected: Taking over transport requires non-NULL "
+               die("BUG: taking over transport requires non-NULL "
                    "smart_options field.");
 
        data = xcalloc(1, sizeof(*data));
@@ -767,19 +768,19 @@ static void die_with_unpushed_submodules(struct string_list *needs_pushing)
 {
        int i;
 
-       fprintf(stderr, "The following submodule paths contain changes that can\n"
-                       "not be found on any remote:\n");
+       fprintf(stderr, _("The following submodule paths contain changes that can\n"
+                       "not be found on any remote:\n"));
        for (i = 0; i < needs_pushing->nr; i++)
-               printf("  %s\n", needs_pushing->items[i].string);
-       fprintf(stderr, "\nPlease try\n\n"
-                       "       git push --recurse-submodules=on-demand\n\n"
-                       "or cd to the path and use\n\n"
-                       "       git push\n\n"
-                       "to push them to a remote.\n\n");
+               fprintf(stderr, "  %s\n", needs_pushing->items[i].string);
+       fprintf(stderr, _("\nPlease try\n\n"
+                         "     git push --recurse-submodules=on-demand\n\n"
+                         "or cd to the path and use\n\n"
+                         "     git push\n\n"
+                         "to push them to a remote.\n\n"));
 
        string_list_clear(needs_pushing, 0);
 
-       die("Aborting.");
+       die(_("Aborting."));
 }
 
 static int run_pre_push_hook(struct transport *transport,