From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 7 Feb 2007 07:46:35 +0000 (-0500)
Subject: Don't crash fast-import if the marks cannot be exported.
X-Git-Tag: v1.5.0-rc4~8^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22c9f7e4c5b1d14868de413b70d26b9b0670078f;p=git.git

Don't crash fast-import if the marks cannot be exported.

Apparently fast-import used to die a horrible death if we
were unable to open the marks file for output.  This is
slightly less than ideal, especially now that we dump
the marks as part of the `checkpoint` command.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/fast-import.c b/fast-import.c
index d9ed3e2f1..face9bba3 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1367,8 +1367,12 @@ static void dump_marks(void)
 	if (mark_file)
 	{
 		FILE *f = fopen(mark_file, "w");
-		dump_marks_helper(f, 0, marks);
-		fclose(f);
+		if (f) {
+			dump_marks_helper(f, 0, marks);
+			fclose(f);
+		} else
+			failure |= error("Unable to write marks file %s: %s",
+				mark_file, strerror(errno));
 	}
 }