diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-07-06 09:39:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-07-06 09:39:46 -0700 |
commit | dd787c19c4f011cc3adb422ef856f2c58d989640 (patch) | |
tree | 1b8fdfb2e14cc423a31ab1ce75c6f05226483da6 /ll-merge.c | |
parent | 864cd9491772367b3ce5b0dda98f068e5bd49680 (diff) | |
parent | 0721c314a5c8fddc877140ab5a333c42c62f780d (diff) | |
download | git-dd787c19c4f011cc3adb422ef856f2c58d989640.tar.gz |
Merge branch 'tr/die_errno'
* tr/die_errno:
Use die_errno() instead of die() when checking syscalls
Convert existing die(..., strerror(errno)) to die_errno()
die_errno(): double % in strerror() output just in case
Introduce die_errno() that appends strerror(errno) to die()
Diffstat (limited to 'll-merge.c')
-rw-r--r-- | ll-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index a2c13c4c08..0571564ddf 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -152,7 +152,7 @@ static void create_temp(mmfile_t *src, char *path) strcpy(path, ".merge_file_XXXXXX"); fd = xmkstemp(path); if (write_in_full(fd, src->ptr, src->size) != src->size) - die("unable to write temp-file"); + die_errno("unable to write temp-file"); close(fd); } |