diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2009-06-27 17:58:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-27 11:14:53 -0700 |
| commit | 0721c314a5c8fddc877140ab5a333c42c62f780d (patch) | |
| tree | 3fbea50f91636df092ac245284e811a32738842c /builtin-commit.c | |
| parent | d824cbba02a4061400a0e382f9bd241fbbff34f0 (diff) | |
| download | git-0721c314a5c8fddc877140ab5a333c42c62f780d.tar.gz git-0721c314a5c8fddc877140ab5a333c42c62f780d.tar.xz | |
Use die_errno() instead of die() when checking syscalls
Lots of die() calls did not actually report the kind of error, which
can leave the user confused as to the real problem. Use die_errno()
where we check a system/library call that sets errno on failure, or
one of the following that wrap such calls:
Function Passes on error from
-------- --------------------
odb_pack_keep open
read_ancestry fopen
read_in_full xread
strbuf_read xread
strbuf_read_file open or strbuf_read_file
strbuf_readlink readlink
write_in_full xwrite
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 88c51bdd3..4bcce06fb 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -434,7 +434,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix) if (isatty(0)) fprintf(stderr, "(reading log message from standard input)\n"); if (strbuf_read(&sb, 0, 0) < 0) - die("could not read log from standard input"); + die_errno("could not read log from standard input"); hook_arg1 = "message"; } else if (logfile) { if (strbuf_read_file(&sb, logfile, 0) < 0) @@ -964,8 +964,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix) /* Finally, get the commit message */ strbuf_reset(&sb); if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) { + int saved_errno = errno; rollback_index_files(); - die("could not read commit message"); + die("could not read commit message: %s", strerror(saved_errno)); } /* Truncate the message just before the diff, if any. */ |