summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-13 13:47:09 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-13 13:47:09 -0700
commitb9a7d55d938a81eb6268196b789d573437492100 (patch)
tree637c6e3452e5b81394faf99f0a4a24ce73c801e8 /wt-status.c
parent9743f18f3fef0b77b8715cba256a740a7238f761 (diff)
parente5b313442ab7c700d0851e9dbe7d2b029e3893e5 (diff)
downloadgit-b9a7d55d938a81eb6268196b789d573437492100.tar.gz
Merge branch 'nd/fopen-errors'
We often try to open a file for reading whose existence is optional, and silently ignore errors from open/fopen; report such errors if they are not due to missing files. * nd/fopen-errors: mingw_fopen: report ENOENT for invalid file names mingw: verify that paths are not mistaken for remote nicknames log: fix memory leak in open_next_file() rerere.c: move error_errno() closer to the source system call print errno when reporting a system call error wrapper.c: make warn_on_inaccessible() static wrapper.c: add and use fopen_or_warn() wrapper.c: add and use warn_on_fopen_errors() config.mak.uname: set FREAD_READS_DIRECTORIES for Darwin, too config.mak.uname: set FREAD_READS_DIRECTORIES for Linux and FreeBSD clone: use xfopen() instead of fopen() use xfopen() in more places git_fopen: fix a sparse 'not declared' warning
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c
index 25aafc35c8..bf651f16fa 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1066,7 +1066,8 @@ static void show_am_in_progress(struct wt_status *s,
static char *read_line_from_git_path(const char *filename)
{
struct strbuf buf = STRBUF_INIT;
- FILE *fp = fopen(git_path("%s", filename), "r");
+ FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
+
if (!fp) {
strbuf_release(&buf);
return NULL;