From: Junio C Hamano Date: Fri, 24 Mar 2017 19:57:53 +0000 (-0700) Subject: Merge branch 'jk/grep-no-index-fix' into maint X-Git-Tag: v2.12.2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea7aa5a464ea7e0d5ee5f3c2a5728d40ebd1f3f1;p=thirdparty%2Fgit.git Merge branch 'jk/grep-no-index-fix' into maint The code to parse the command line "git grep ... [[--] ...]" has been cleaned up, and a handful of bugs have been fixed (e.g. we used to check "--" if it is a rev). * jk/grep-no-index-fix: grep: treat revs the same for --untracked as for --no-index grep: do not diagnose misspelt revs with --no-index grep: avoid resolving revision names in --no-index case grep: fix "--" rev/pathspec disambiguation grep: re-order rev-parsing loop grep: do not unnecessarily query repo for "--" grep: move thread initialization a little lower --- ea7aa5a464ea7e0d5ee5f3c2a5728d40ebd1f3f1