From af5323e0274fad058f13949b89a9191a7bef7e38 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 30 May 2005 00:09:07 -0700 Subject: [PATCH] Add -O 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 --- diff.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 38a1babd50..d5881c777a 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]) diffcore_pathspec(paths); @@ -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, -- cgit v1.2.1