Merge branch 'nd/index-pack-error-message' into maint

* nd/index-pack-error-message: index-pack: report error using the correct variable
git-mirror · Apr 3, 2014 · 3dd1083 · 3dd1083
2 parents 9cbd46a + de983a0
commit 3dd1083
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
@@ -1291,15 +1291,15 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 		if (keep_fd < 0) {
 			if (errno != EEXIST)
 				die_errno(_("cannot write keep file '%s'"),
-					  keep_name);
+					  keep_name ? keep_name : name);
 		} else {
 			if (keep_msg_len > 0) {
 				write_or_die(keep_fd, keep_msg, keep_msg_len);
 				write_or_die(keep_fd, "\n", 1);
 			}
 			if (close(keep_fd) != 0)
 				die_errno(_("cannot close written keep file '%s'"),
-				    keep_name);
+					  keep_name ? keep_name : name);
 			report = "keep";
 		}
 	}