* [PATCH] upload-pack: only accept commits from "shallow" line
@ 2013-01-08 11:32 Nguyễn Thái Ngọc Duy
2013-01-08 17:27 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Nguyễn Thái Ngọc Duy @ 2013-01-08 11:32 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Nguyễn Thái Ngọc Duy
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 <pclouds@gmail.com>
---
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;
--
1.8.0.rc0.19.g7bbb31d
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] upload-pack: only accept commits from "shallow" line
2013-01-08 11:32 [PATCH] upload-pack: only accept commits from "shallow" line Nguyễn Thái Ngọc Duy
@ 2013-01-08 17:27 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2013-01-08 17:27 UTC (permalink / raw)
To: Nguyễn Thái Ngọc Duy; +Cc: git
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 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 <pclouds@gmail.com>
> ---
Thanks. I agree with you that while this is not wrong per-se, this
will not matter in real life.
> 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;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-08 17:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-08 11:32 [PATCH] upload-pack: only accept commits from "shallow" line Nguyễn Thái Ngọc Duy
2013-01-08 17:27 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).