summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-21 23:57:45 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-22 02:37:45 -0700
commit6973dcaee76ef7b7bfcabd2f26e76205aae07858 (patch)
treed402af70d42da329136fe82692c91eb8d7d68260 /diff.h
parente64961b0573b0e72bd55eab6d36bd97f859f9516 (diff)
downloadgit-6973dcaee76ef7b7bfcabd2f26e76205aae07858.tar.gz
Libify diff-files.
This is the first installment to libify diff brothers. The updated diff-files uses revision.c::setup_revisions() infrastructure to parse its command line arguments, which means the pathname arguments are checked more strictly than before. The tests are adjusted to separate possibly missing paths from the rest of arguments with double-dashes, to show the kosher way. As Linus pointed out, renaming diff.c to diff-lib.c was simply stupid, so I am renaming it back. The new diff-lib.c is to contain pieces extracted from diff brothers. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index 52fff6643f..da4bd421fe 100644
--- a/diff.h
+++ b/diff.h
@@ -28,10 +28,11 @@ struct diff_options {
with_raw:1,
with_stat:1,
tree_in_recursive:1,
- full_index:1;
+ full_index:1,
+ silent_on_remove:1,
+ find_copies_harder:1;
int break_opt;
int detect_rename;
- int find_copies_harder;
int line_termination;
int output_format;
int pickaxe_opts;
@@ -168,4 +169,6 @@ extern void diff_flush(struct diff_options*);
extern const char *diff_unique_abbrev(const unsigned char *, int);
+extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
+
#endif /* DIFF_H */