unpack-trees: handle lstat failure for existing file

diff --git a/diff.h b/diff.h
index d43da9da95fae4dd13d3abbe738948708cf90939..bf2f44d840735684c89f654ee6f3b3a935af2c55 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -218,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;