Merge branch 'es/submodule-fetch-message-fix' into maint

Error message fix.

* es/submodule-fetch-message-fix:
  submodule: add newline on invalid submodule error

diff --combined submodule.c
index 9430db8ffcb25e9e6a2802d20291891075d78bcf,a2e2239eace49860f296875536f3a389ad288959..6b867445f0c8564301527d2786394e27b1ea35cb
--- 1/submodule.c
--- 2/submodule.c
+++ b/submodule.c
@@@ -431,7 -431,7 +431,7 @@@ void handle_ignore_submodules_arg(struc
        else if (!strcmp(arg, "dirty"))
                diffopt->flags.ignore_dirty_submodules = 1;
        else if (strcmp(arg, "none"))
 -              die("bad --ignore-submodules argument: %s", arg);
 +              die(_("bad --ignore-submodules argument: %s"), arg);
        /*
         * Please update _git_status() in git-completion.bash when you
         * add new options
@@@ -812,9 -812,9 +812,9 @@@ static void collect_changed_submodules_
                                submodule = submodule_from_name(me->repo,
                                                                commit_oid, name);
                        if (submodule) {
 -                              warning("Submodule in commit %s at path: "
 +                              warning(_("Submodule in commit %s at path: "
                                        "'%s' collides with a submodule named "
 -                                      "the same. Skipping it.",
 +                                      "the same. Skipping it."),
                                        oid_to_hex(commit_oid), p->two->path);
                                name = NULL;
                        }
@@@ -844,7 -844,7 +844,7 @@@ static void collect_changed_submodules(
        repo_init_revisions(r, &rev, NULL);
        setup_revisions(argv->argc, argv->argv, &rev, NULL);
        if (prepare_revision_walk(&rev))
 -              die("revision walk setup failed");
 +              die(_("revision walk setup failed"));
  
        while ((commit = get_revision(&rev))) {
                struct rev_info diff_rev;
@@@ -992,7 -992,7 +992,7 @@@ static int submodule_needs_pushing(stru
                cp.out = -1;
                cp.dir = path;
                if (start_command(&cp))
 -                      die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
 +                      die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
                                        path);
                if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
                        needs_pushing = 1;
@@@ -1115,7 -1115,7 +1115,7 @@@ static void submodule_push_check(const 
         * child process.
         */
        if (run_command(&cp))
 -              die("process for submodule '%s' failed", path);
 +              die(_("process for submodule '%s' failed"), path);
  }
  
  int push_unpushed_submodules(struct repository *r,
@@@ -1155,10 -1155,10 +1155,10 @@@
        /* Actually push the submodules */
        for (i = 0; i < needs_pushing.nr; i++) {
                const char *path = needs_pushing.items[i].string;
 -              fprintf(stderr, "Pushing submodule '%s'\n", path);
 +              fprintf(stderr, _("Pushing submodule '%s'\n"), path);
                if (!push_submodule(path, remote, rs,
                                    push_options, dry_run)) {
 -                      fprintf(stderr, "Unable to push submodule '%s'\n", path);
 +                      fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
                        ret = 0;
                }
        }
@@@ -1448,7 -1448,7 +1448,7 @@@ static int get_next_submodule(struct ch
                        prepare_submodule_repo_env_in_gitdir(&cp->env_array);
                        cp->git_cmd = 1;
                        if (!spf->quiet)
 -                              strbuf_addf(err, "Fetching submodule %s%s\n",
 +                              strbuf_addf(err, _("Fetching submodule %s%s\n"),
                                            spf->prefix, ce->name);
                        argv_array_init(&cp->args);
                        argv_array_pushv(&cp->args, spf->args.argv);
@@@ -1478,7 -1478,7 +1478,7 @@@
                            !is_empty_dir(ce->name)) {
                                spf->result = 1;
                                strbuf_addf(err,
-                                           _("Could not access submodule '%s'"),
+                                           _("Could not access submodule '%s'\n"),
                                            ce->name);
                        }
                }
@@@ -1610,7 -1610,7 +1610,7 @@@ int fetch_populated_submodules(struct r
                goto out;
  
        if (repo_read_index(r) < 0)
 -              die("index file corrupt");
 +              die(_("index file corrupt"));
  
        argv_array_push(&spf.args, "fetch");
        for (i = 0; i < options->argc; i++)
@@@ -1665,7 -1665,7 +1665,7 @@@ unsigned is_submodule_modified(const ch
        cp.out = -1;
        cp.dir = path;
        if (start_command(&cp))
 -              die("Could not run 'git status --porcelain=2' in submodule %s", path);
 +              die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
  
        fp = xfdopen(cp.out, "r");
        while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
@@@ -1706,7 -1706,7 +1706,7 @@@
        fclose(fp);
  
        if (finish_command(&cp) && !ignore_cp_exit_code)
 -              die("'git status --porcelain=2' failed in submodule %s", path);
 +              die(_("'git status --porcelain=2' failed in submodule %s"), path);
  
        strbuf_release(&buf);
        return dirty_submodule;
@@@ -1841,7 -1841,7 +1841,7 @@@ static int submodule_has_dirty_index(co
        cp.no_stdout = 1;
        cp.dir = sub->path;
        if (start_command(&cp))
 -              die("could not recurse into submodule '%s'", sub->path);
 +              die(_("could not recurse into submodule '%s'"), sub->path);
  
        return finish_command(&cp);
  }
@@@ -1862,7 -1862,7 +1862,7 @@@ static void submodule_reset_index(cons
        argv_array_push(&cp.args, empty_tree_oid_hex());
  
        if (run_command(&cp))
 -              die("could not reset submodule index");
 +              die(_("could not reset submodule index"));
  }
  
  /**