diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2020-04-07 10:27:53 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-04-07 16:57:30 -0700 |
| commit | bfa50c2c7f0cb806af6d272a84c16f114e15ceee (patch) | |
| tree | e6f08cc9039ed1ce9e08a1d0f9d3dad6891da3d9 | |
| parent | sequencer: make read_oneliner() accept flags (diff) | |
| download | tgif-bfa50c2c7f0cb806af6d272a84c16f114e15ceee.tar.xz | |
sequencer: configurably warn on non-existent files
In the future, we plan on externing read_oneliner(). Future users of
read_oneliner() will want the ability to output warnings in the event
that the `path` doesn't exist. Introduce the
`READ_ONELINER_WARN_MISSING` flag which, if active, would issue a
warning when a file doesn't exist by always executing warning_errno()
in the case where strbuf_read_file() fails.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 6c4e8743ef..32cc289da3 100644 --- a/sequencer.c +++ b/sequencer.c @@ -420,6 +420,7 @@ static int write_message(const void *buf, size_t len, const char *filename, } #define READ_ONELINER_SKIP_IF_EMPTY (1 << 0) +#define READ_ONELINER_WARN_MISSING (1 << 1) /* * Reads a file that was presumably written by a shell script, i.e. with an @@ -436,7 +437,8 @@ static int read_oneliner(struct strbuf *buf, int orig_len = buf->len; if (strbuf_read_file(buf, path, 0) < 0) { - if (errno != ENOENT && errno != ENOTDIR) + if ((flags & READ_ONELINER_WARN_MISSING) || + (errno != ENOENT && errno != ENOTDIR)) warning_errno(_("could not read '%s'"), path); return 0; } |