Merge branch 'jc/fsck-dropped-errors'

diff --git a/cache.h b/cache.h
index 79066e57dc806d118366d9807e0af338b72e2fb2..274137ae161dcb3bc4c702fadde179c5c59a8f92 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -443,6 +443,7 @@ extern char *get_object_directory(void);
 extern char *get_index_file(void);
 extern char *get_graft_file(void);
 extern int set_git_dir(const char *path);
+extern int get_common_dir_noenv(struct strbuf *sb, const char *gitdir);
 extern int get_common_dir(struct strbuf *sb, const char *gitdir);
 extern const char *get_git_namespace(void);
 extern const char *strip_namespace(const char *namespaced_ref);
@@ -1091,7 +1092,6 @@ struct date_mode {
                DATE_NORMAL = 0,
                DATE_RELATIVE,
                DATE_SHORT,
-               DATE_LOCAL,
                DATE_ISO8601,
                DATE_ISO8601_STRICT,
                DATE_RFC2822,
@@ -1099,6 +1099,7 @@ struct date_mode {
                DATE_RAW
        } type;
        const char *strftime_fmt;
+       int local;
 };
 
 /*