fast-import: Don't use a maybe-clobbered errno value

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 5d50d93a52e7c138b0ecf0ff2b69baa1f9dc5e51..073d5cbf1ba97acf527770d912870cda01195489 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -69,6 +69,7 @@ struct diff_options {
        const char *orderfile;
        const char *pickaxe;
        const char *single_follow;
+       const char *a_prefix, *b_prefix;
        unsigned flags;
        int context;
        int break_opt;
@@ -171,6 +172,7 @@ extern void diff_unmerge(struct diff_options *,
 #define DIFF_SETUP_USE_CACHE           2
 #define DIFF_SETUP_USE_SIZE_CACHE      4
 
+extern int git_diff_basic_config(const char *var, const char *value);
 extern int git_diff_ui_config(const char *var, const char *value);
 extern void diff_setup(struct diff_options *);
 extern int diff_opt_parse(struct diff_options *, const char **, int);
@@ -247,4 +249,6 @@ extern int run_diff_index(struct rev_info *revs, int cached);
 extern int do_diff_cache(const unsigned char *, struct diff_options *);
 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
 
+extern int diff_result_code(struct diff_options *, int);
+
 #endif /* DIFF_H */