kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Linus Torvalds	f66475199c	Fix silly typo in new builtin grep The "-F" flag apparently got mis-translated due to some over-eager copy-paste work into a duplicate "-H" when using the external grep. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	ffa0a7ab36	builtin-grep: unparse more command line options. The earlier one to use external grep missed some often used options. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Linus Torvalds	1e2398d7fa	builtin-grep: use external grep when we can take advantage of it It's not perfect, but it gets the "git grep some-random-string" down to the good old half-a-second range for the kernel. It should convert more of the argument flags for "grep", that should be trivial to expand (I did a few just as an example). It should also bother to try to return the right "hit" value (which it doesn't, right now - the code is kind of there, but I didn't actually bother to do it _right_). Also, right now it _just_ limits by number of arguments, but it should also strictly speaking limit by total argument size (ie add up the length of the filenames, and do the "exec_grep()" flush call if it's bigger than some random value like 32kB). But I think that it's _conceptually_ doing all the right things, and it seems to work. So maybe somebody else can do some of the final polish. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	07ea91d84f	builtin-grep: -F (--fixed-strings) Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	02ab1c490d	builtin-grep: -w fix Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	c39c4f4746	builtin-grep: typofix Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	5acd64edec	builtin-grep: tighten argument parsing. I mistyped git grep next -e '"^@"' '.c' and got many hits that contain "next" without complaint. Obviously what I meant to say was: git grep -e '"^@"' next -- '.c' This tightens the argument parsing rule a bit: - All "grep" parameters should come first; - If there is no -e nor -f to specify pattern, the first non option string is the parameter; - After that, zero or more revs can follow. - An optional '--' can be present, and is skipped. - All the rest are pathspecs. If '--' was not there, they must be paths that exist in the working tree. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	aa8c79ad03	Teach -f <file> option to builtin-grep. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	e23d2d6b76	builtin-grep: -L (--files-without-match). Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	b8d0f5a003	builtin-grep: binary files -a and -I Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	7ed36f56e3	builtin-grep: terminate correctly at EOF It barfed and segfaulted with an incomplete line. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	1e3d90e013	builtin-grep: tighten path wildcard vs tree traversal. The earlier code descended into Documentation/technical when given "Documentation/how*" as the pattern, which was too loose. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	7839a25eab	builtin-grep: support -w (--word-regexp). Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	2c866cf1c2	builtin-grep: support -c (--count). Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	f9b9faf6f8	builtin-grep: allow more than one patterns. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	f462ebb48b	builtin-grep: allow -<n> and -[ABC]<n> notation for context lines. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	a24f1e254e	builtin-grep: printf %.*s length is int, not ptrdiff_t. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	1362671f6a	builtin-grep: do not use setup_revisions() Grep may want to grok multiple revisions, but it does not make much sense to walk revisions while doing so. This stops calling the code to parse parameters for the revision walker. The parameter parsing for the optional "-e" option becomes a lot simpler with it as well. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	df0e7aa864	builtin-grep: support '-l' option. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	e0eb889f8e	builtin-grep: wildcard pathspec fixes This tweaks the pathspec wildcard used in builtin-grep to match that of ls-files. With this: git grep -e DEBUG -- '/Kconfig' would work like the shell script version, and you could even do: git grep -e DEBUG --cached -- '/Kconfig' ;# from index git grep -e DEBUG v2.6.12 -- '/Kconfig' ;# from rev Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	5010cb5fcc	built-in "git grep" This attempts to set up built-in "git grep" to further reduce our dependence on the shell, while at the same time optionally allowing to run grep against object database. You could do funky things like these: git grep --cached -e pattern ;# grep from index git grep -e pattern master ;# or in a rev git grep -e pattern master next ;# or in multiple revs git grep -e pattern pu^@ ;# even like this with an ;# extension from another topic ;-) git grep -e pattern master..next ;# or even from rev ranges git grep -e pattern master~20:Documentation ;# or an arbitrary tree git grep -e pattern next:git-commit.sh ;# or an arbitrary blob Right now, it does not understand and/or obey many options grep should accept, and the pattern must be given with -e option due to the way the parameter parser is structured, both of which obviously need to be fixed for usability. But this is going in the right direction. The shell script version is one of the worst Portability offender in the git barebone Porcelainish; it uses xargs -0 to pass paths around and shell arrays to sift flags and parameters. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago

1 2

71 Commits (7f314565fe20e324e8db1a7c233e43ca4e3683f0)