mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/xopen-reports-open-failures'

Browse Source 
Error diagnostics improvement.

* rs/xopen-reports-open-failures:
  use xopen() to handle fatal open(2) failures
  xopen: explicitly report creation failures
This commit is contained in:
Junio C Hamano
2021-09-08 13:30:32 -07:00
parent c8f491668e 66e905b7dd
commit 7b06222619
16 changed files with 36 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -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);