X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=diff.h;h=bf2f44d840735684c89f654ee6f3b3a935af2c55;hb=d48b28418355ef41a9501eb28a82ec0b69e62a17;hp=53ad345469ad106e768c0d9eda7f732e09832b01;hpb=29e1353a7debe4e73cb5d6d2d5a0c4479e9eb768;p=thirdparty%2Fgit.git

diff --git a/diff.h b/diff.h
index 53ad345469..bf2f44d840 100644
--- a/diff.h
+++ b/diff.h
@@ -127,6 +127,9 @@ struct diff_options {
 	/* this is set by diffcore for DIFF_FORMAT_PATCH */
 	int found_changes;
 
+	/* to support internal diff recursion by --follow hack*/
+	int found_follow;
+
 	FILE *file;
 	int close_file;
 
@@ -215,6 +218,13 @@ extern void diff_unmerge(struct diff_options *,
 #define DIFF_SETUP_USE_CACHE		2
 #define DIFF_SETUP_USE_SIZE_CACHE	4
 
+/*
+ * Poor man's alternative to parse-option, to allow both sticked form
+ * (--option=value) and separate form (--option value).
+ */
+extern int parse_long_opt(const char *opt, const char **argv,
+			 const char **optarg);
+
 extern int git_diff_basic_config(const char *var, const char *value, void *cb);
 extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 extern int diff_use_color_default;