merge-recur: do not setenv("GIT_INDEX_FILE")

diff --git a/cache.h b/cache.h
index c575b8a9962d4eec64e91b1b0df38e60b20df288..7c69b30637406a17fd6ccadcfa58a2a809fba0bb 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -145,6 +145,7 @@ extern void verify_non_filename(const char *prefix, const char *name);
 extern int read_cache(void);
 extern int read_cache_from(const char *path);
 extern int write_cache(int newfd, struct cache_entry **cache, int entries);
+extern int discard_cache(void);
 extern int verify_path(const char *path);
 extern int cache_name_pos(const char *name, int namelen);
 #define ADD_CACHE_OK_TO_ADD 1          /* Ok to add */