diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-05-03 17:16:46 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-26 12:33:55 +0900 |
| commit | 23a9e0712d76a63c5af1caeb816943f466f0300e (patch) | |
| tree | 1b065a078058d664ed353f6da0c77842381a5645 /builtin/merge.c | |
| parent | b0a642ac4624740187212aecec62b35a2eab38cb (diff) | |
| download | git-23a9e0712d76a63c5af1caeb816943f466f0300e.tar.gz | |
use xfopen() in more places
xfopen()
- provides error details
- explains error on reading, or writing, or whatever operation
- has l10n support
- prints file name in the error
Some of these are missing in the places that are replaced with xfopen(),
which is a clear win. In some other places, it's just less code (not as
clearly a win as the previous case but still is).
The only slight regresssion is in remote-testsvn, where we don't report
the file class (marks files) in the error messages anymore. But since
this is a _test_ svn remote transport, I'm not too concerned.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 703827f006..65a1501858 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -839,9 +839,7 @@ static int suggest_conflicts(void) struct strbuf msgbuf = STRBUF_INIT; filename = git_path_merge_msg(); - fp = fopen(filename, "a"); - if (!fp) - die_errno(_("Could not open '%s' for writing"), filename); + fp = xfopen(filename, "a"); append_conflicts_hint(&msgbuf); fputs(msgbuf.buf, fp); |