summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-28 09:53:43 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-29 18:42:29 (GMT)
commite25de75696dc99f327c8dd8e2cba937939e281ca (patch)
tree9c70871ec9f2240bb268c078574492675599f748 /diff-files.c
parent6af1f0192ff8740fe77db7cf02c739ccfbdf119c (diff)
downloadgit-e25de75696dc99f327c8dd8e2cba937939e281ca.zip
git-e25de75696dc99f327c8dd8e2cba937939e281ca.tar.gz
git-e25de75696dc99f327c8dd8e2cba937939e281ca.tar.bz2
[PATCH] Pickaxe fixes.
A bug in the command line argument parsing code was making pickaxe not to work at all in diff-cache and diff-files commands. Embarrassingly enough, the working pickaxe in diff-tree tells me that it was not working in these two commands from day one. This patch fixes it. Also updates the documentation to describe the --pickaxe-all option. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-files.c')
-rw-r--r--diff-files.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-files.c b/diff-files.c
index bd0eb95..8ab7915 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -53,7 +53,7 @@ int main(int argc, const char **argv)
diff_output_format = DIFF_FORMAT_MACHINE;
else if (!strcmp(argv[1], "-R"))
diff_setup_opt |= DIFF_SETUP_REVERSE;
- else if (!strcmp(argv[1], "-S"))
+ else if (!strncmp(argv[1], "-S", 2))
pickaxe = argv[1] + 2;
else if (!strcmp(argv[1], "--pickaxe-all"))
pickaxe_opts = DIFF_PICKAXE_ALL;