Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line'

diff --git a/cache.h b/cache.h
index 5eb36b413ce9a26851687d89d49fc964ed745098..44c02600008ff5b2858a0b212b84cd917739cd64 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1092,7 +1092,6 @@ struct date_mode {
                DATE_NORMAL = 0,
                DATE_RELATIVE,
                DATE_SHORT,
-               DATE_LOCAL,
                DATE_ISO8601,
                DATE_ISO8601_STRICT,
                DATE_RFC2822,
@@ -1100,6 +1099,7 @@ struct date_mode {
                DATE_RAW
        } type;
        const char *strftime_fmt;
+       int local;
 };
 
 /*
@@ -1276,6 +1276,7 @@ extern void close_pack_index(struct packed_git *);
 
 extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
 extern void close_pack_windows(struct packed_git *);
+extern void close_all_packs(void);
 extern void unuse_pack(struct pack_window **);
 extern void free_pack_by_name(const char *);
 extern void clear_delta_base_cache(void);