From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Mar 2014 18:08:19 +0000 (-0700)
Subject: Merge branch 'nd/index-pack-error-message'
X-Git-Tag: v2.0.0-rc0~64
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0e8c09263e87c548de006cdb6af035d42f845087?hp=66d913367d2344f313210e6441bd41e975a47b1d

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

* nd/index-pack-error-message:
index-pack: report error using the correct variable
---

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index a6b1c17996..b9f6e12c0e 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1291,7 +1291,7 @@ 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);
@@ -1299,7 +1299,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 			}
 			if (close(keep_fd) != 0)
 				die_errno(_("cannot close written keep file '%s'"),
-				    keep_name);
+					  keep_name ? keep_name : name);
 			report = "keep";
 		}
 	}