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 /combine-diff.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 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 60d03676bb..bbf74fc42e 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -746,7 +746,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, done = read_in_full(fd, result, len); if (done < 0) - die("read error '%s'", elem->path); + die_errno("read error '%s'", elem->path); else if (done < len) die("early EOF '%s'", elem->path); |