diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-30 00:09:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-30 18:10:46 -0700 |
| commit | af5323e0274fad058f13949b89a9191a7bef7e38 (patch) | |
| tree | 6bf28a92074958605af6e31e46bf12bbaef6f726 /diff-cache.c | |
| parent | 2036d841020b7500eca7d568bd0c353b4fe73408 (diff) | |
| download | git-af5323e0274fad058f13949b89a9191a7bef7e38.tar.gz | |
[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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-cache.c')
| -rw-r--r-- | diff-cache.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/diff-cache.c b/diff-cache.c index 7d067a8f44..2aaf16a39d 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -10,6 +10,7 @@ static int diff_score_opt = 0; static const char *pickaxe = NULL; static int pickaxe_opts = 0; static int diff_break_opt = -1; +static const char *orderfile = NULL; /* A file entry went away or appeared */ static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode) @@ -215,6 +216,10 @@ int main(int argc, const char **argv) pickaxe = arg + 2; continue; } + if (!strncmp(arg, "-O", 2)) { + orderfile = arg + 2; + continue; + } if (!strcmp(arg, "--pickaxe-all")) { pickaxe_opts = DIFF_PICKAXE_ALL; continue; @@ -249,7 +254,8 @@ int main(int argc, const char **argv) diffcore_std(pathspec ? : NULL, detect_rename, diff_score_opt, pickaxe, pickaxe_opts, - diff_break_opt); + diff_break_opt, + orderfile); diff_flush(diff_output_format, 1); return ret; } |