summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2006-03-29 02:16:33 +0200
committerJunio C Hamano <junkio@cox.net>2006-04-04 13:44:15 -0700
commitd01d8c6782850c18d62676dae3c72ad73be1e52e (patch)
tree01fe7875ac96d7170e6bdaffee2cfdb88a0dcd65 /diff.c
parent810e1523753553968aac827f57e0e24fc9af6546 (diff)
downloadgit-d01d8c6782850c18d62676dae3c72ad73be1e52e.tar.gz
Support for pickaxe matching regular expressions
git-diff-* --pickaxe-regex will change the -S pickaxe to match POSIX extended regular expressions instead of fixed strings. The regex.h library is a rather stupid interface and I like pcre too, but with any luck it will be everywhere we will want to run Git on, it being POSIX.2 and all. I'm not sure if we can expect platforms like AIX to conform to POSIX.2 or if win32 has regex.h. We might add a flag to Makefile if there is a portability trouble potential. Signed-off-by: Petr Baudis <pasky@suse.cz>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index e496905bad..2db2cc568d 100644
--- a/diff.c
+++ b/diff.c
@@ -883,6 +883,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
options->filter = arg + 14;
else if (!strcmp(arg, "--pickaxe-all"))
options->pickaxe_opts = DIFF_PICKAXE_ALL;
+ else if (!strcmp(arg, "--pickaxe-regex"))
+ options->pickaxe_opts = DIFF_PICKAXE_REGEX;
else if (!strncmp(arg, "-B", 2)) {
if ((options->break_opt =
diff_scoreopt_parse(arg)) == -1)