diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:04 -0700 |
| commit | 3dd108348f53d26acad91ce6059c94ec5a9390d2 (patch) | |
| tree | e5dc8d627545c00e4af535df34a33cc7ed78a6fd | |
| parent | 9cbd46aee1d803d8d4d634b4eed19065f19198cb (diff) | |
| parent | de983a0a1817437fbb0db938ecf91f73023a5f87 (diff) | |
| download | git-3dd108348f53d26acad91ce6059c94ec5a9390d2.tar.gz | |
Merge branch 'nd/index-pack-error-message' into maint
* nd/index-pack-error-message:
index-pack: report error using the correct variable
| -rw-r--r-- | builtin/index-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 2f37a38fbc..fa74972886 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"; } } |