summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-09-03 20:27:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-03 20:45:38 (GMT)
commitc969b6a18d1cde3ffb8a5ca5cd45a57052c2cc95 (patch)
tree264b0824403569cfa4966e9a9713c0094967c129
parent75aa26d34c4a80142512bd980a416b0fb30044c1 (diff)
downloadgit-c969b6a18d1cde3ffb8a5ca5cd45a57052c2cc95.zip
git-c969b6a18d1cde3ffb8a5ca5cd45a57052c2cc95.tar.gz
git-c969b6a18d1cde3ffb8a5ca5cd45a57052c2cc95.tar.bz2
peel_onion: do not assume length of x_type globals
When we are parsing "rev^{foo}", we check "foo" against the various global type strings, like "commit_type", "tree_type", etc. This is nicely abstracted, but then we destroy the abstraction completely by using magic numbers that must match the length of the type strings. We could avoid these magic numbers by using skip_prefix. But taking a step back, we can realize that using the "commit_type" global is not really buying us anything. It is not ever going to change from being "commit" without causing severe breakage to existing uses. And even if it did change for some crazy reason, we would want to evaluate its effects on the "rev^{}" syntax, anyway. Let's just switch these to using a custom string literal, as we do for "rev^{object}". The resulting code is more robust to changes in the type strings, and is more readable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--sha1_name.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 6dc496d..2f6e5ab 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -677,13 +677,13 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
return -1;
sp++; /* beginning of type name, or closing brace for empty */
- if (!strncmp(commit_type, sp, 6) && sp[6] == '}')
+ if (!prefixcmp(sp, "commit}"))
expected_type = OBJ_COMMIT;
- else if (!strncmp(tag_type, sp, 3) && sp[3] == '}')
+ else if (!prefixcmp(sp, "tag}"))
expected_type = OBJ_TAG;
- else if (!strncmp(tree_type, sp, 4) && sp[4] == '}')
+ else if (!prefixcmp(sp, "tree}"))
expected_type = OBJ_TREE;
- else if (!strncmp(blob_type, sp, 4) && sp[4] == '}')
+ else if (!prefixcmp(sp, "blob}"))
expected_type = OBJ_BLOB;
else if (!prefixcmp(sp, "object}"))
expected_type = OBJ_ANY;