unpack-objects: fix --strict handling

diff --git a/fast-import.c b/fast-import.c
index 117f38c0f1066d3c2627cea7179e0c316372a13e..7f197d5e36ae977e21251dbb45fa72973ea7830f 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -459,6 +459,10 @@ static void write_crash_report(const char *err)
        fclose(rpt);
 }
 
+static void end_packfile(void);
+static void unkeep_all_packs(void);
+static void dump_marks(void);
+
 static NORETURN void die_nicely(const char *err, va_list params)
 {
        static int zombie;
@@ -472,6 +476,9 @@ static NORETURN void die_nicely(const char *err, va_list params)
        if (!zombie) {
                zombie = 1;
                write_crash_report(message);
+               end_packfile();
+               unkeep_all_packs();
+               dump_marks();
        }
        exit(128);
 }
@@ -2370,6 +2377,7 @@ int main(int argc, const char **argv)
 {
        unsigned int i, show_stats = 1;
 
+       setup_git_directory();
        git_config(git_pack_config);
        if (!pack_compression_seen && core_compression_seen)
                pack_compression_level = core_compression_level;