From: Stefan Beller Date: Thu, 23 Mar 2017 22:33:35 GMT Subject: [PATCH 4/7] submodule.c: factor out early loop termination in is_submodule_modified Message-ID: <20170323223338.32274-5-sbeller@google.com> In-Reply-To: <20170323223338.32274-1-sbeller@google.com> This makes it easier for a follow up patch. Signed-off-by: Stefan Beller --- submodule.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/submodule.c b/submodule.c index da1db90dda..93d6f08b50 100644 --- a/submodule.c +++ b/submodule.c @@ -1072,16 +1072,14 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) while (strbuf_getwholeline_fd(&buf, cp.out, '\n') != EOF) { /* regular untracked files */ - if (buf.buf[0] == '?') { + if (buf.buf[0] == '?') dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED; - if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED) - break; - } else { + else dirty_submodule |= DIRTY_SUBMODULE_MODIFIED; - if (ignore_untracked || - (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)) - break; - } + + if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) && + ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) || ignore_untracked)) + break; } close(cp.out); -- 2.12.1.438.gb674c4c09c