summaryrefslogtreecommitdiff
path: root/diff-helper.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-27 22:56:17 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-29 18:17:43 (GMT)
commit6145ee8b361959db04b8cdefc883e4fc2dc27276 (patch)
treebeee0b115472b88e0bcb2fb46ef7df7208485c0d /diff-helper.c
parent15d061b435a7e3b6bead39df3889f4af78c4b00a (diff)
downloadgit-6145ee8b361959db04b8cdefc883e4fc2dc27276.zip
git-6145ee8b361959db04b8cdefc883e4fc2dc27276.tar.gz
git-6145ee8b361959db04b8cdefc883e4fc2dc27276.tar.bz2
[PATCH] Move pathspec to the beginning of the diffcore chain.
This changes the way how pathspec is used in the three diff-* brothers. Earlier, they tried to grab as much information from the original input and used pathspec to limit the output. This version uses pathspec upfront to narrow the world diffcore operates in, so "git-diff-* <arguments> some-directory" does not look at things outside the specified subtree when finding rename/copy or running pickaxe. Since diff-tree already takes this view and does not feed anything outside the specified directotires to begin with, this patch does not have to touch that command. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-helper.c')
-rw-r--r--diff-helper.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/diff-helper.c b/diff-helper.c
index 03ac910..6456405 100644
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -129,17 +129,17 @@ int main(int ac, const char **av) {
new_path);
continue;
}
- if (pickaxe)
- diffcore_pickaxe(pickaxe, pickaxe_opts);
if (1 < ac)
diffcore_pathspec(av + 1);
+ if (pickaxe)
+ diffcore_pickaxe(pickaxe, pickaxe_opts);
diff_flush(DIFF_FORMAT_PATCH, 0);
printf("%s\n", sb.buf);
}
- if (pickaxe)
- diffcore_pickaxe(pickaxe, pickaxe_opts);
if (1 < ac)
diffcore_pathspec(av + 1);
+ if (pickaxe)
+ diffcore_pickaxe(pickaxe, pickaxe_opts);
diff_flush(DIFF_FORMAT_PATCH, 0);
return 0;
}