X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=diff.h;h=63738c1dd4c71cb1beacaffea40bf51377a137ea;hb=180a9f226860e18cdc2c3987ae89c239b318b408;hp=eece65ddccdb7bd8bf51af80af92e29b4eb76f37;hpb=5bac4a671907604b5fb4e24ff682d5b0e8431931;p=git.git

diff --git a/diff.h b/diff.h
index eece65ddc..63738c1dd 100644
--- a/diff.h
+++ b/diff.h
@@ -56,7 +56,11 @@ struct diff_options {
 		 silent_on_remove:1,
 		 find_copies_harder:1,
 		 color_diff:1,
-		 color_diff_words:1;
+		 color_diff_words:1,
+		 has_changes:1,
+		 quiet:1,
+		 allow_external:1,
+		 exit_with_status:1;
 	int context;
 	int break_opt;
 	int detect_rename;
@@ -75,6 +79,9 @@ struct diff_options {
 	int stat_width;
 	int stat_name_width;
 
+	/* this is set by diffcore for DIFF_FORMAT_PATCH */
+	int found_changes;
+
 	int nr_paths;
 	const char **paths;
 	int *pathlens;
@@ -167,8 +174,6 @@ extern int diff_setup_done(struct diff_options *);
 
 extern void diffcore_std(struct diff_options *);
 
-extern void diffcore_std_no_resolve(struct diff_options *);
-
 #define COMMON_DIFF_OPTIONS_HELP \
 "\ncommon diff options:\n" \
 "  -z            output diff-raw with lines terminated with NUL.\n" \
@@ -219,6 +224,9 @@ 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);
+extern int setup_diff_no_index(struct rev_info *revs,
+		int argc, const char ** argv, int nongit, const char *prefix);
+extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
 
 extern int run_diff_index(struct rev_info *revs, int cached);