mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'nd/index-pack-error-message' into maint
* nd/index-pack-error-message: index-pack: report error using the correct variable
This commit is contained in:
commit
3dd108348f
|
@ -1291,7 +1291,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
|
||||||
if (keep_fd < 0) {
|
if (keep_fd < 0) {
|
||||||
if (errno != EEXIST)
|
if (errno != EEXIST)
|
||||||
die_errno(_("cannot write keep file '%s'"),
|
die_errno(_("cannot write keep file '%s'"),
|
||||||
keep_name);
|
keep_name ? keep_name : name);
|
||||||
} else {
|
} else {
|
||||||
if (keep_msg_len > 0) {
|
if (keep_msg_len > 0) {
|
||||||
write_or_die(keep_fd, keep_msg, keep_msg_len);
|
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)
|
if (close(keep_fd) != 0)
|
||||||
die_errno(_("cannot close written keep file '%s'"),
|
die_errno(_("cannot close written keep file '%s'"),
|
||||||
keep_name);
|
keep_name ? keep_name : name);
|
||||||
report = "keep";
|
report = "keep";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue