Finish current packfile during fast-import crash handler

spearce · gitster · commit 118805b92097 · 2008-02-16T00:47:07.000-08:00
If fast-import is in the middle of crashing due to a protocol error
or something like that then it can be very useful to have the mark
table and all objects up until that point be available for a new
import to resume from.

Currently we just close the active packfile, unkeep all of our
newly created packfiles (so they can be deleted), and dump the
marks table to a temporary file.

We don't attempt to update the refs/tags that the process has in
memory as much of that data can be found in the crash report and I'm
not sure it would be the right thing to do under every type of crash.

Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -459,6 +459,10 @@ static void write_crash_report(const char *err)`
`459`	`459`	`fclose(rpt);`
`460`	`460`	`}`
`461`	`461`
	`462`	`+static void end_packfile(void);`
	`463`	`+static void unkeep_all_packs(void);`
	`464`	`+static void dump_marks(void);`
	`465`	`+`
`462`	`466`	`static NORETURN void die_nicely(const char *err, va_list params)`
`463`	`467`	`{`
`464`	`468`	`static int zombie;`
`@@ -472,6 +476,9 @@ static NORETURN void die_nicely(const char *err, va_list params)`
`472`	`476`	`if (!zombie) {`
`473`	`477`	`zombie = 1;`
`474`	`478`	`write_crash_report(message);`
	`479`	`+ end_packfile();`
	`480`	`+ unkeep_all_packs();`
	`481`	`+ dump_marks();`
`475`	`482`	`}`
`476`	`483`	`exit(128);`
`477`	`484`	`}`