Junio C Hamano <gitster@xxxxxxxxx> writes: > Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes: > >> When parse_pathspec() is called with no paths, the behavior could be >> either return no paths, or return one path that is cwd. Some commands >> do the former, some the latter. parse_pathspec() itself does not make >> either the default and requires the caller to specify either flag if >> it may run into this situation. >> >> I've grep'd through all parse_pathspec() call sites. Some pass >> neither, but those are guaranteed never pass empty path to >> parse_pathspec(). There are two call sites that may pass empty path >> and are fixed with this patch. >> >> Reported-by: Antoine Pelisse <apelisse@xxxxxxxxx> >> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> >> --- > > Thanks. I've amended it with the following taken from Antoine's initial report. diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh index 72300b5..d8f23f4 100755 --- a/t/t4208-log-magic-pathspec.sh +++ b/t/t4208-log-magic-pathspec.sh @@ -46,4 +46,19 @@ test_expect_success 'git log HEAD -- :/' ' test_cmp expected actual ' +test_expect_success 'command line pathspec parsing for "git log"' ' + git reset --hard && + >a && + git add a && + git commit -m "add an empty a" --allow-empty && + echo 1 >a && + git commit -a -m "update a to 1" && + git checkout HEAD^ && + echo 2 >a && + git commit -a -m "update a to 2" && + test_must_fail git merge master && + git add a && + git log --merge -- a +' + test_done -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html