diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2009-06-27 17:58:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-27 11:14:53 -0700 |
| commit | d824cbba02a4061400a0e382f9bd241fbbff34f0 (patch) | |
| tree | ae0c9be6c2778dd10c4cc207957e346855bd4418 /builtin-merge.c | |
| parent | f8b5a8e13cb4d60c8b630f92a8f07590ef218ec5 (diff) | |
| download | git-d824cbba02a4061400a0e382f9bd241fbbff34f0.tar.gz | |
Convert existing die(..., strerror(errno)) to die_errno()
Change calls to die(..., strerror(errno)) to use the new die_errno().
In the process, also make slight style adjustments: at least state
_something_ about the function that failed (instead of just printing
the pathname), and put paths in single quotes.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 8d101eff0b..436263bc19 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -294,9 +294,9 @@ static void squash_message(void) NULL, NULL, rev.date_mode, 0); } if (write(fd, out.buf, out.len) < 0) - die("Writing SQUASH_MSG: %s", strerror(errno)); + die_errno("Writing SQUASH_MSG"); if (close(fd)) - die("Finishing SQUASH_MSG: %s", strerror(errno)); + die_errno("Finishing SQUASH_MSG"); strbuf_release(&out); } @@ -428,8 +428,8 @@ static void merge_name(const char *remote, struct strbuf *msg) fp = fopen(git_path("FETCH_HEAD"), "r"); if (!fp) - die("could not open %s for reading: %s", - git_path("FETCH_HEAD"), strerror(errno)); + die_errno("could not open '%s' for reading", + git_path("FETCH_HEAD")); strbuf_getline(&line, fp, '\n'); fclose(fp); ptr = strstr(line.buf, "\tnot-for-merge\t"); |