Merge branch 'dt/submodule-rm-with-stale-cache'

Running "git rm" on a submodule failed unnecessarily when
.gitmodules is only cache-dirty, which has been corrected.

* dt/submodule-rm-with-stale-cache:
  git rm submodule: succeed if .gitmodules index stat info is zero

diff --combined submodule.c
index 3a184b66ab23e604249844ca7e6dbce68330f32e,86e46d3dcee603524de01522be88a52cd0a3854d..5e8e3d14802adc1baad0071df07d70bcdc57d371
--- 1/submodule.c
--- 2/submodule.c
+++ b/submodule.c
@@@ -82,7 -82,7 +82,7 @@@ int is_staging_gitmodules_ok(struct ind
        if ((pos >= 0) && (pos < istate->cache_nr)) {
                struct stat st;
                if (lstat(GITMODULES_FILE, &st) == 0 &&
-                   ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
+                   ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
                        return 0;
        }
  
@@@ -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;
                }
        }
@@@ -1280,12 -1280,10 +1280,12 @@@ struct submodule_parallel_fetch 
        /* Pending fetches by OIDs */
        struct fetch_task **oid_fetch_tasks;
        int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
 +
 +      struct strbuf submodules_with_errors;
  };
  #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0, \
                  STRING_LIST_INIT_DUP, \
 -                NULL, 0, 0}
 +                NULL, 0, 0, STRBUF_INIT}
  
  static int get_fetch_recurse_config(const struct submodule *submodule,
                                    struct submodule_parallel_fetch *spf)
@@@ -1450,7 -1448,7 +1450,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);
@@@ -1549,10 -1547,7 +1549,10 @@@ static int fetch_finish(int retvalue, s
        struct string_list_item *it;
        struct oid_array *commits;
  
 -      if (retvalue)
 +      if (!task || !task->sub)
 +              BUG("callback cookie bogus");
 +
 +      if (retvalue) {
                /*
                 * NEEDSWORK: This indicates that the overall fetch
                 * failed, even though there may be a subsequent fetch
@@@ -1562,9 -1557,8 +1562,9 @@@
                 */
                spf->result = 1;
  
 -      if (!task || !task->sub)
 -              BUG("callback cookie bogus");
 +              strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
 +                          task->sub->name);
 +      }
  
        /* Is this the second time we process this submodule? */
        if (task->commits)
@@@ -1616,7 -1610,7 +1616,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++)
@@@ -1633,11 -1627,6 +1633,11 @@@
                                   &spf,
                                   "submodule", "parallel/fetch");
  
 +      if (spf.submodules_with_errors.len > 0)
 +              fprintf(stderr, _("Errors during submodule fetch:\n%s"),
 +                      spf.submodules_with_errors.buf);
 +
 +
        argv_array_clear(&spf.args);
  out:
        free_submodules_oids(&spf.changed_submodule_names);
@@@ -1676,7 -1665,7 +1676,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) {
@@@ -1717,7 -1706,7 +1717,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;
@@@ -1822,7 -1811,7 +1822,7 @@@ out
  void submodule_unset_core_worktree(const struct submodule *sub)
  {
        char *config_path = xstrfmt("%s/modules/%s/config",
 -                                  get_git_common_dir(), sub->name);
 +                                  get_git_dir(), sub->name);
  
        if (git_config_set_in_file_gently(config_path, "core.worktree", NULL))
                warning(_("Could not unset core.worktree setting in submodule '%s'"),
@@@ -1852,7 -1841,7 +1852,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);
  }
@@@ -1873,7 -1862,7 +1873,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"));
  }
  
  /**
@@@ -1925,7 -1914,7 +1925,7 @@@ int submodule_move_head(const char *pat
                                        ABSORB_GITDIR_RECURSE_SUBMODULES);
                } else {
                        char *gitdir = xstrfmt("%s/modules/%s",
 -                                  get_git_common_dir(), sub->name);
 +                                  get_git_dir(), sub->name);
                        connect_work_tree_and_git_dir(path, gitdir, 0);
                        free(gitdir);
  
@@@ -1935,7 -1924,7 +1935,7 @@@
  
                if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
                        char *gitdir = xstrfmt("%s/modules/%s",
 -                                  get_git_common_dir(), sub->name);
 +                                  get_git_dir(), sub->name);
                        connect_work_tree_and_git_dir(path, gitdir, 1);
                        free(gitdir);
                }