1 files changed, 11 insertions, 6 deletions
diff --git a/userdiff.h b/userdiff.h
index cc8e5abfef..7565930337 100644
--- a/userdiff.h
+++ b/userdiff.h
@@ -7,19 +7,24 @@ struct index_state;
 struct repository;
 
 struct userdiff_funcname {
-	char *pattern;
+	const char *pattern;
 	int cflags;
 };
 
+struct external_diff {
+	char *cmd;
+	unsigned trust_exit_code:1;
+};
+
 struct userdiff_driver {
 	const char *name;
-	char *external;
-	char *algorithm;
+	struct external_diff external;
+	const char *algorithm;
 	int binary;
 	struct userdiff_funcname funcname;
-	char *word_regex;
-	char *word_regex_multi_byte;
-	char *textconv;
+	const char *word_regex;
+	const char *word_regex_multi_byte;
+	const char *textconv;
 	struct notes_cache *textconv_cache;
 	int textconv_want_cache;
 };