mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Add --diff-filter= output restriction to diff-* family.

Browse Source 
This is a halfway between debugging aid and a helper to write an
ultra-smart merge scripts.  The new option takes a string that
consists of a list of "status" letters, and limits the diff
output to only those classes of changes, with two exceptions:

 - A broken pair (aka "complete rewrite"), does not match D
   (deleted) or N (created).  Use B to look for them.

 - The letter "A" in the diff-filter string does not match
   anything itself, but causes the entire diff that contains
   selected patches to be output (this behaviour is similar to
   that of --pickaxe-all for the -S option).

For example,

    $ git-rev-list HEAD |
      git-diff-tree --stdin -s -v -B -C --diff-filter=BCR

shows a list of commits that have complete rewrite, copy, or
rename.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-06-11 20:57:13 -07:00
committed by Linus Torvalds
parent a7ca65405c
commit f2ce9fde57
7 changed files with 108 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
diff.h
View File

@ -47,7 +47,11 @@ extern void diffcore_std(const char **paths,
int detect_rename, int rename_score,
const char *pickaxe, int pickaxe_opts,
int break_opt,
const char *orderfile);
const char *orderfile, const char *filter);
extern void diffcore_std_no_resolve(const char **paths,
const char *pickaxe, int pickaxe_opts,
const char *orderfile, const char *filter);
extern int diff_queue_is_empty(void);
@ -56,6 +60,6 @@ extern int diff_queue_is_empty(void);
#define DIFF_FORMAT_PATCH 2
#define DIFF_FORMAT_NO_OUTPUT 3
extern void diff_flush(int output_style, int resolve_rename_copy);
extern void diff_flush(int output_style);
#endif /* DIFF_H */