Include the fast-import marks table in crash reports

spearce · gitster · commit 3b08e5b8c913 · 2008-02-16T00:47:07.000-08:00
If fast-import was not run with --export-marks but we are crashing
the frontend application developer may still benefit from having
that information available to them.  We now include the marks table
as part of the crash report if --export-marks was not supplied on
the command line.

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
@@ -372,6 +372,8 @@ static void write_branch_report(FILE *rpt, struct branch *b)
 	fputc('\n', rpt);
 }
 
+static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
+
 static void write_crash_report(const char *err)
 {
 	char *loc = git_path("fast_import_crash_%d", getpid());
@@ -443,6 +445,14 @@ static void write_crash_report(const char *err)
 		}
 	}
 
+	fputc('\n', rpt);
+	fputs("Marks\n", rpt);
+	fputs("-----\n", rpt);
+	if (mark_file)
+		fprintf(rpt, "  exported to %s\n", mark_file);
+	else
+		dump_marks_helper(rpt, 0, marks);
+
 	fputc('\n', rpt);
 	fputs("-------------------\n", rpt);
 	fputs("END OF CRASH REPORT\n", rpt);

Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,8 @@ static void write_branch_report(FILE rpt, struct branch b)`
`372`	`372`	`fputc('\n', rpt);`
`373`	`373`	`}`
`374`	`374`
	`375`	`+static void dump_marks_helper(FILE , uintmax_t, struct mark_set );`
	`376`	`+`
`375`	`377`	`static void write_crash_report(const char *err)`
`376`	`378`	`{`
`377`	`379`	`char *loc = git_path("fast_import_crash_%d", getpid());`
`@@ -443,6 +445,14 @@ static void write_crash_report(const char *err)`
`443`	`445`	`}`
`444`	`446`	`}`
`445`	`447`
	`448`	`+ fputc('\n', rpt);`
	`449`	`+ fputs("Marks\n", rpt);`
	`450`	`+ fputs("-----\n", rpt);`
	`451`	`+ if (mark_file)`
	`452`	`+ fprintf(rpt, " exported to %s\n", mark_file);`
	`453`	`+ else`
	`454`	`+ dump_marks_helper(rpt, 0, marks);`
	`455`	`+`
`446`	`456`	`fputc('\n', rpt);`
`447`	`457`	`fputs("-------------------\n", rpt);`
`448`	`458`	`fputs("END OF CRASH REPORT\n", rpt);`