mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/upload-pack-shallow-must-be-commit'

Browse Source 
A minor consistency check patch that does not have much relevance
to the real world.

* nd/upload-pack-shallow-must-be-commit:
  upload-pack: only accept commits from "shallow" line
This commit is contained in:
Junio C Hamano
2013-01-14 08:15:44 -08:00
parent 0a9a787fca 6293ded348
commit e43171a4a7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
upload-pack.c
View File

@ -603,6 +603,8 @@ static void receive_needs(void)
object = parse_object(sha1); object = parse_object(sha1);
if (!object) if (!object)
die("did not find object for %s", line); 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; object->flags |= CLIENT_SHALLOW;
add_object_array(object, NULL, &shallows); add_object_array(object, NULL, &shallows);
continue; continue;