Merge branch 'maint'

* maint: fetch-pack: check for valid commit from server
2011-08-18 22:06:03 -07:00 · 2011-08-18 22:06:03 -07:00 · 7c10882c0d
parent f85a051d13 ec099546a9
commit 7c10882c0d
1 changed files with 2 additions and 0 deletions
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@ -395,6 +395,8 @@ static int find_common(int fd[2], unsigned char *result_sha1,
 				case ACK_continue: {
 					struct commit *commit =
 						lookup_commit(result_sha1);
+					if (!commit)
+						die("invalid commit %s", sha1_to_hex(result_sha1));
 					if (args.stateless_rpc
 					 && ack == ACK_common
 					 && !(commit->object.flags & COMMON)) {