Previously mktree would accept tree entries which had a mismatch between the
declared type and the actual type of object identified by the sha.
Signed-off-by: Josh Micich <josh.micich@xxxxxxxxx>
---
builtin-mktree.c | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/builtin-mktree.c b/builtin-mktree.c
index a56c917..a37954a 100644
--- a/builtin-mktree.c
+++ b/builtin-mktree.c
@@ -71,7 +71,7 @@ static void mktree_line(char *buf, size_t len, int
line_termination, int allow_m
{
char *ptr, *ntr;
unsigned mode;
- enum object_type type;
+ enum object_type mode_type;
char *path;
unsigned char sha1[20];
@@ -94,29 +94,37 @@ static void mktree_line(char *buf, size_t len, int
line_termination, int allow_m
if (S_ISGITLINK(mode))
allow_missing = 1;
- if (!allow_missing)
- type = sha1_object_info(sha1, NULL);
- else
- type = object_type(mode);
-
- if (type < 0)
- die("object %s unavailable", sha1_to_hex(sha1));
*ntr++ = 0; /* now at the beginning of SHA1 */
- if (type != type_from_string(ptr))
- die("object type %s mismatch (%s)", ptr, typename(type));
path = ntr + 41; /* at the beginning of name */
+ struct strbuf p_uq = STRBUF_INIT;
if (line_termination && path[0] == '"') {
- struct strbuf p_uq = STRBUF_INIT;
if (unquote_c_style(&p_uq, path, NULL))
die("invalid quoting");
path = strbuf_detach(&p_uq, NULL);
append_to_tree(mode, sha1, path);
- strbuf_release(&p_uq);
- return;
}
+
+ mode_type = object_type(mode);
+ if (mode_type != type_from_string(ptr)) {
+ die("entry '%s' object type (%s) doesn't match mode type (%s)",
path, ptr, typename(mode_type));
+ }
+
+ enum object_type obj_type = sha1_object_info(sha1, NULL);
+ if (obj_type < 0) {
+ if (!allow_missing) {
+ die("entry '%s' object %s is unavailable", path,
sha1_to_hex(sha1));
+ }
+ } else {
+ if (obj_type != mode_type) {
+ die("entry '%s' object %s is a %s but specified type
was (%s)",
+ path, sha1_to_hex(sha1), typename(obj_type),
typename(mode_type));
+ }
+ }
+
append_to_tree(mode, sha1, path);
+ strbuf_release(&p_uq); // safe to call on unused empty buffer
}
int cmd_mktree(int ac, const char **av, const char *prefix)
--
1.6.3.165.g2cce5.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html