From c8e1ee4f2c8e28b7eef824248f09ba37599593d7 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 4 Jun 2014 03:11:11 -0400 Subject: update-index: fix segfault with missing --cacheinfo argument Running "git update-index --cacheinfo" without any further arguments results in a segfault rather than an error message. Commit ec160ae (update-index: teach --cacheinfo a new syntax "mode,sha1,path", 2014-03-23) added code to examine the format of the argument, but forgot to handle the NULL case. Returning an error from the parser is enough, since we then treat it as an old-style "--cacheinfo ", and complain that we have less than 3 arguments to read. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t2107-update-index-basic.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 't') diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index fe2fb17102..1bafb9098c 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -29,6 +29,10 @@ test_expect_success 'update-index -h with corrupt index' ' test_i18ngrep "[Uu]sage: git update-index" broken/usage ' +test_expect_success '--cacheinfo complains of missing arguments' ' + test_must_fail git update-index --cacheinfo +' + test_expect_success '--cacheinfo does not accept blob null sha1' ' echo content >file && git add file && -- cgit v1.2.3