From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, jrnieder@gmail.com
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/7] submodule.c: factor out early loop termination in is_submodule_modified
Date: Fri, 24 Mar 2017 17:36:05 -0700 [thread overview]
Message-ID: <20170325003610.15282-3-sbeller@google.com> (raw)
In-Reply-To: <20170325003610.15282-1-sbeller@google.com>
This makes it easier for a follow up patch.
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
---
submodule.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/submodule.c b/submodule.c
index 2c667ac95a..93e3fefd39 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1075,16 +1075,16 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
len = strbuf_read(&buf, cp.out, 1024);
line = buf.buf;
while (len > 2) {
- if ((line[0] == '?') && (line[1] == '?')) {
+ if ((line[0] == '?') && (line[1] == '?'))
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;
+
next_line = strchr(line, '\n');
if (!next_line)
break;
--
2.12.0.rc1.49.gdeb397943c.dirty
next prev parent reply other threads:[~2017-03-25 0:36 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 0:43 [PATCHv3 0/3] short status: improve reporting for submodule changes Stefan Beller
2017-03-23 0:43 ` [PATCH 1/3] submodule.c: port is_submodule_modified to use porcelain 2 Stefan Beller
2017-03-23 0:53 ` Jonathan Nieder
2017-03-23 6:09 ` Junio C Hamano
2017-03-23 18:47 ` Stefan Beller
2017-03-23 0:43 ` [PATCH 2/3] submodule.c, is_submodule_modified: stricter checking for submodules Stefan Beller
2017-03-23 0:54 ` Jonathan Nieder
2017-03-23 0:43 ` [PATCH 3/3] short status: improve reporting for submodule changes Stefan Beller
2017-03-23 1:06 ` Jonathan Nieder
2017-03-23 21:09 ` [PATCH 0/8] " Stefan Beller
2017-03-23 21:09 ` [PATCH 1/8] submodule.c: port is_submodule_modified to use porcelain 2 Stefan Beller
2017-03-23 21:09 ` [PATCH 2/8] submodule.c: use argv_array in is_submodule_modified Stefan Beller
2017-03-23 21:09 ` [PATCH 3/8] submodule.c: convert is_submodule_modified to use strbuf_getwholeline_fd Stefan Beller
2017-03-23 21:09 ` [PATCH 4/8] submodule.c: port is_submodule_modified to use porcelain 2 Stefan Beller
2017-03-23 21:09 ` [PATCH 5/8] submodule.c: factor out early loop termination in is_submodule_modified Stefan Beller
2017-03-23 21:09 ` [PATCH 6/8] submodule.c: stricter checking for submodules " Stefan Beller
2017-03-23 21:09 ` [PATCH 7/8] short status: improve reporting for submodule changes Stefan Beller
2017-03-23 21:09 ` [PATCH 8/8] submodule.c: correctly handle nested submodules in is_submodule_modified Stefan Beller
2017-03-23 21:11 ` [PATCH 0/8] short status: improve reporting for submodule changes Stefan Beller
2017-03-23 22:33 ` [PATCH v5 0/7] " Stefan Beller
2017-03-23 22:33 ` [PATCH 1/7] submodule.c: use argv_array in is_submodule_modified Stefan Beller
2017-03-23 22:36 ` Jonathan Nieder
2017-03-23 22:33 ` [PATCH 2/7] submodule.c: convert is_submodule_modified to use strbuf_getwholeline_fd Stefan Beller
2017-03-23 22:50 ` Jonathan Nieder
2017-03-23 23:04 ` Stefan Beller
2017-03-23 23:11 ` Stefan Beller
2017-03-23 22:33 ` [PATCH 3/7] submodule.c: port is_submodule_modified to use porcelain 2 Stefan Beller
2017-03-23 22:33 ` [PATCH 4/7] submodule.c: factor out early loop termination in is_submodule_modified Stefan Beller
2017-03-23 22:33 ` [PATCH 5/7] submodule.c: stricter checking for submodules " Stefan Beller
2017-03-23 22:33 ` [PATCH 6/7] short status: improve reporting for submodule changes Stefan Beller
2017-03-24 18:28 ` [PATCH v6 0/7] " Stefan Beller
2017-03-24 18:28 ` [PATCH 1/7] submodule.c: use argv_array in is_submodule_modified Stefan Beller
2017-03-24 22:25 ` Jonathan Nieder
2017-03-24 18:28 ` [PATCH 2/7] submodule.c: factor out early loop termination " Stefan Beller
2017-03-24 22:30 ` Jonathan Nieder
2017-03-24 18:28 ` [PATCH 3/7] submodule.c: convert is_submodule_modified to use strbuf_getwholeline Stefan Beller
2017-03-24 22:38 ` Jonathan Nieder
2017-03-25 0:12 ` Stefan Beller
2017-03-24 18:28 ` [PATCH 4/7] submodule.c: port is_submodule_modified to use porcelain 2 Stefan Beller
2017-03-24 22:41 ` Jonathan Nieder
2017-03-24 18:29 ` [PATCH 5/7] submodule.c: stricter checking for submodules in is_submodule_modified Stefan Beller
2017-03-24 22:42 ` Jonathan Nieder
2017-03-24 18:29 ` [PATCH 6/7] short status: improve reporting for submodule changes Stefan Beller
2017-03-24 23:06 ` Jonathan Nieder
2017-03-24 18:29 ` [PATCH 7/7] submodule.c: correctly handle nested submodules in is_submodule_modified Stefan Beller
2017-03-24 23:31 ` Jonathan Nieder
2017-03-25 0:25 ` Stefan Beller
2017-03-25 0:36 ` [PATCH v7 0/7] short status: improve reporting for submodule changes Stefan Beller
2017-03-25 0:36 ` [PATCH 1/7] submodule.c: use argv_array in is_submodule_modified Stefan Beller
2017-03-25 0:36 ` Stefan Beller [this message]
2017-03-25 0:36 ` [PATCH 3/7] submodule.c: convert is_submodule_modified to use strbuf_getwholeline Stefan Beller
2017-03-25 0:36 ` [PATCH 4/7] submodule.c: port is_submodule_modified to use porcelain 2 Stefan Beller
2017-03-25 0:36 ` [PATCH 5/7] submodule.c: stricter checking for submodules in is_submodule_modified Stefan Beller
2017-03-25 0:36 ` [PATCH 6/7] short status: improve reporting for submodule changes Stefan Beller
2017-03-25 0:36 ` [PATCH 7/7] submodule.c: correctly handle nested submodules in is_submodule_modified Stefan Beller
2017-03-27 21:46 ` Junio C Hamano
2017-03-28 1:05 ` Jonathan Nieder
2017-03-30 18:18 ` Junio C Hamano
2017-03-28 21:20 ` Stefan Beller
2017-03-25 1:35 ` [PATCH v7 0/7] short status: improve reporting for submodule changes Jonathan Nieder
2017-03-28 23:09 ` [PATCH v8 " Stefan Beller
2017-03-28 23:09 ` [PATCH 1/2] " Stefan Beller
2017-03-28 23:24 ` Jonathan Nieder
2017-03-28 23:09 ` [PATCH 2/2] submodule.c: correctly handle nested submodules in is_submodule_modified Stefan Beller
2017-03-28 23:42 ` Jonathan Nieder
2017-03-29 22:00 ` Stefan Beller
2017-03-29 22:26 ` [PATCHv9 (6,7)/7] short status: improve reporting for submodule changes Stefan Beller
2017-03-29 22:26 ` [PATCH 1/2] " Stefan Beller
2017-03-29 23:09 ` Jonathan Nieder
2017-03-29 22:26 ` [PATCH 2/2] submodule.c: correctly handle nested submodules in is_submodule_modified Stefan Beller
2017-03-29 23:13 ` Jonathan Nieder
2017-03-30 18:28 ` Junio C Hamano
2017-03-23 22:33 ` [PATCH 7/7] " Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170325003610.15282-3-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.