diff options
| author |  René Scharfe <l.s.r@web.de> | 2021-08-25 22:16:46 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-25 14:39:08 -0700 |
| commit | 66e905b7dd0f4e9dd576be681f30fbaeeb19ec4a (patch) | |
| tree | 4cff22e9d61be87fc5bce6952981e8ba1c7b7127 /builtin/merge.c | |
| parent | xopen: explicitly report creation failures (diff) | |
| download | tgif-66e905b7dd0f4e9dd576be681f30fbaeeb19ec4a.tar.xz | |
use xopen() to handle fatal open(2) failures
Add and apply a semantic patch for using xopen() instead of calling
open(2) and die() or die_errno() explicitly. This makes the error
messages more consistent and shortens the code.
Signed-off-by: René Scharfe <l.s.r@web.de>
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 22f23990b3..47614d8070 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1136,9 +1136,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); |