A prepatory change for a future patch that moves the status parsing
logic to a separate function.
Signed-off-by: Calvin Wan <calvinwan@xxxxxxxxxx>
---
submodule.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/submodule.c b/submodule.c
index fae24ef34a..faf37c1101 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1906,25 +1906,28 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
fp = xfdopen(cp.out, "r");
while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
+ char *str = buf.buf;
+ const size_t len = buf.len;
+
/* regular untracked files */
- if (buf.buf[0] == '?')
+ if (str[0] == '?')
dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
- if (buf.buf[0] == 'u' ||
- buf.buf[0] == '1' ||
- buf.buf[0] == '2') {
+ if (str[0] == 'u' ||
+ str[0] == '1' ||
+ str[0] == '2') {
/* T = line type, XY = status, SSSS = submodule state */
- if (buf.len < strlen("T XY SSSS"))
+ if (len < strlen("T XY SSSS"))
BUG("invalid status --porcelain=2 line %s",
- buf.buf);
+ str);
- if (buf.buf[5] == 'S' && buf.buf[8] == 'U')
+ if (str[5] == 'S' && str[8] == 'U')
/* nested untracked file */
dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
- if (buf.buf[0] == 'u' ||
- buf.buf[0] == '2' ||
- memcmp(buf.buf + 5, "S..U", 4))
+ if (str[0] == 'u' ||
+ str[0] == '2' ||
+ memcmp(str + 5, "S..U", 4))
/* other change */
dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
}
--
2.40.0.rc0.216.gc4246ad0f0-goog
