> I'll only add that we could also do this on top:
>
> diff --git a/submodule.c b/submodule.c
> index c7c6bfb2e26..eeb940d96a0 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -1875,7 +1875,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
> struct child_process cp = CHILD_PROCESS_INIT;
> struct strbuf buf = STRBUF_INIT;
> FILE *fp;
> - unsigned dirty_submodule = 0;
> + unsigned dirty_submodule0 = 0;
> const char *git_dir;
> int ignore_cp_exit_code = 0;
>
> @@ -1908,10 +1908,11 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
> while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
> char *str = buf.buf;
> const size_t len = buf.len;
> + unsigned *dirty_submodule = &dirty_submodule0;
>
> /* regular untracked files */
> if (str[0] == '?')
> - dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
> + *dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
>
> if (str[0] == 'u' ||
> str[0] == '1' ||
> @@ -1923,17 +1924,17 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
>
> if (str[5] == 'S' && str[8] == 'U')
> /* nested untracked file */
> - dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
> + *dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
>
> if (str[0] == 'u' ||
> str[0] == '2' ||
> memcmp(str + 5, "S..U", 4))
> /* other change */
> - dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
> + *dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
> }
>
> - if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
> - ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
> + if ((*dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
> + ((*dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
> ignore_untracked)) {
> /*
> * We're not interested in any further information from
> @@ -1949,7 +1950,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
> die(_("'git status --porcelain=2' failed in submodule %s"), path);
>
> strbuf_release(&buf);
> - return dirty_submodule;
> + return dirty_submodule0;
> }
>
> int submodule_uses_gitfile(const char *path)
>
> Which, if we're massaging this for a subsequent smaller diff we can do
> to make only the comment adjustment part of this be a non-moved line.
Ah that's a neat little trick -- I'll save this one for the next time I do a
refactor like this :)
