Re: [PATCH] upload-pack: only accept commits from "shallow" line
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:41
Nguyễn Thái Ngọc Duy [off-list ref] writes:
We only allow cuts at commits, not arbitrary objects. upload-pack will fail eventually in register_shallow if a non-commit is given with a generic error "Object %s is a %s, not a commit". Check it early and give a more accurate error. This should never show up in an ordinary session. It's for buggy clients, or when the user manually edits .git/shallow. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> ---
Thanks. I agree with you that while this is not wrong per-se, this will not matter in real life.
quoted hunk
upload-pack.c | 2 ++ 1 file changed, 2 insertions(+)diff --git a/upload-pack.c b/upload-pack.c index 6142421..95d8313 100644 --- a/upload-pack.c +++ b/upload-pack.c@@ -603,6 +603,8 @@ static void receive_needs(void) object = parse_object(sha1); if (!object) die("did not find object for %s", line); + if (object->type != OBJ_COMMIT) + die("invalid shallow object %s", sha1_to_hex(sha1)); object->flags |= CLIENT_SHALLOW; add_object_array(object, NULL, &shallows); continue;