X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=d83e53e9d465ba73808ff5071b17b7f13ad27b09;hb=dc2204fe32385fba349e18d953dacd152c72fe00;hp=11d13cf70b3e9dbb8fe0f9e19bba7ea864bfa049;hpb=467ddc14fe37ea6a3d77058fb24c4240e82e6344;p=git.git

diff --git a/diff.h b/diff.h
index 11d13cf70..d83e53e9d 100644
--- a/diff.h
+++ b/diff.h
@@ -111,7 +111,9 @@ struct diff_options {
 	int pickaxe_opts;
 	int rename_score;
 	int rename_limit;
-	int warn_on_too_large_rename;
+	int needed_rename_limit;
+	int degraded_cc_to_c;
+	int show_rename_progress;
 	int dirstat_percent;
 	int setup;
 	int abbrev;
@@ -208,10 +210,7 @@ extern void diff_change(struct diff_options *,
 			const char *fullpath,
 			unsigned dirty_submodule1, unsigned dirty_submodule2);
 
-extern void diff_unmerge(struct diff_options *,
-			 const char *path,
-			 unsigned mode,
-			 const unsigned char *sha1);
+extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
 
 #define DIFF_SETUP_REVERSE      	1
 #define DIFF_SETUP_USE_CACHE		2
@@ -273,6 +272,7 @@ extern void diffcore_fix_diff_index(struct diff_options *);
 
 extern int diff_queue_is_empty(void);
 extern void diff_flush(struct diff_options*);
+extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
 
 /* diff-raw status letters */
 #define DIFF_STATUS_ADDED		'A'