path: root/diff.c
diff options
authorJunio C Hamano <>2005-05-30 07:09:07 (GMT)
committerLinus Torvalds <>2005-05-31 01:10:46 (GMT)
commitaf5323e0274fad058f13949b89a9191a7bef7e38 (patch)
tree6bf28a92074958605af6e31e46bf12bbaef6f726 /diff.c
parent2036d841020b7500eca7d568bd0c353b4fe73408 (diff)
[PATCH] Add -O<orderfile> option to diff-* brothers.
A new diffcore filter diffcore-order is introduced. This takes a text file each of whose line is a shell glob pattern. Patches that match a glob pattern on an earlier line in the file are output before patches that match a later line, and patches that do not match any glob pattern are output last. A typical orderfile for git project probably should look like this: README Makefile Documentation *.h *.c Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'diff.c')
1 files changed, 4 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 38a1bab..d5881c7 100644
--- a/diff.c
+++ b/diff.c
@@ -888,7 +888,8 @@ void diff_flush(int diff_output_style, int resolve_rename_copy)
void diffcore_std(const char **paths,
int detect_rename, int rename_score,
const char *pickaxe, int pickaxe_opts,
- int break_opt)
+ int break_opt,
+ const char *orderfile)
if (paths && paths[0])
@@ -898,6 +899,8 @@ void diffcore_std(const char **paths,
diffcore_rename(detect_rename, rename_score);
if (pickaxe)
diffcore_pickaxe(pickaxe, pickaxe_opts);
+ if (orderfile)
+ diffcore_order(orderfile);
void diff_addremove(int addremove, unsigned mode,