Merge branch 'nd/magic-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:29 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:33 +0000 (12:10 -0700)
All callers to parse_pathspec() must choose between getting no
pathspec or one path that is limited to the current directory
when there is no paths given on the command line, but there were
two callers that violated this rule, triggering a BUG().

* nd/magic-pathspec:
Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags

1  2 
line-log.c
revision.c
diff --cc line-log.c
Simple merge
diff --cc revision.c
Simple merge