diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-08 13:30:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 13:30:32 -0700 |
| commit | 7b062226196c7234818106ab5274b32519e41575 (patch) | |
| tree | af74b94d18186099a4a7929968a7691138058735 /builtin/merge.c | |
| parent | Merge branch 'dd/diff-files-unmerged-fix' (diff) | |
| parent | use xopen() to handle fatal open(2) failures (diff) | |
| download | tgif-7b062226196c7234818106ab5274b32519e41575.tar.xz | |
Merge branch 'rs/xopen-reports-open-failures'
Error diagnostics improvement.
* rs/xopen-reports-open-failures:
use xopen() to handle fatal open(2) failures
xopen: explicitly report creation failures
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 febb0c99c9..42a1989d4a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1138,9 +1138,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge merge_names = &fetch_head_file; filename = git_path_fetch_head(the_repository); - fd = open(filename, O_RDONLY); - if (fd < 0) - die_errno(_("could not open '%s' for reading"), filename); + fd = xopen(filename, O_RDONLY); if (strbuf_read(merge_names, fd, 0) < 0) die_errno(_("could not read '%s'"), filename); |