Thread (9 messages) flat view 9 messages, 3 authors, 2016-06-15
DORMANTno replies

[PATCH 2/4] builtin-for-each-ref.c: check if we need to peel onion while parsing the format

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:14
Subsystem: the rest · Maintainer: Linus Torvalds

Instead of iterating over the parsed atoms that are used in the output
format after all the parsing is done, check it while parsing the
format string.

Signed-off-by: Junio C Hamano <redacted>
---
 builtin-for-each-ref.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 3698e82..d68977e 100644
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -133,6 +133,8 @@ static int parse_atom(const char *atom, const char *ep)
 				  (sizeof(*used_atom_type) * used_atom_cnt));
 	used_atom[at] = xmemdupz(atom, ep - atom);
 	used_atom_type[at] = valid_atom[i].cmp_type;
+	if (*atom == '*')
+		need_tagged = 1;
 	return at;
 }
 
@@ -944,13 +946,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 	refs = cbdata.grab_array;
 	num_refs = cbdata.grab_cnt;
 
-	for (i = 0; i < used_atom_cnt; i++) {
-		if (used_atom[i][0] == '*') {
-			need_tagged = 1;
-			break;
-		}
-	}
-
 	sort_refs(sort, refs, num_refs);
 
 	if (!maxcount || num_refs < maxcount)
-- 
1.7.0.169.g57c99
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help