submodule.c: factor out early loop termination in is_submodule_modified
This makes it easier for a follow up patch. Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Mar 24, 2017 at 17:36 UTC
64f9a946f07d2ca00b34c466654a3f608c78b6af
1 file changed
+8
-8
submodule.c
+8
-8
@@ -1075,16 +1075,16 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
1075
len = strbuf_read(&buf, cp.out, 1024);
1076
line = buf.buf;
1077
while (len > 2) {
1078
- if ((line[0] == '?') && (line[1] == '?')) {
1078
+ if ((line[0] == '?') && (line[1] == '?'))
1079
dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1080
- if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
1081
- break;
1082
- } else {
1080
+ else
1081
dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
1084
- if (ignore_untracked ||
1085
- (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED))
1086
- break;
1087
- }
1082
+
1083
+ if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
1084
+ ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
1085
+ ignore_untracked))
1086
+ break;
1087
+
1088
next_line = strchr(line, '\n');
1089
if (!next_line)
1090
break;