| Message ID | 6d409ad45867aa5193c15828614e865e53ac0c57.1655336146.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5a09991e32f3487702bd032703bacba1c4c46612 |
| Headers | show |
| Series | Coverity fixes | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > Reported by Coverity. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > fsmonitor-settings.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c > index 658cb79da01..464424a1e92 100644 > --- a/fsmonitor-settings.c > +++ b/fsmonitor-settings.c > @@ -202,11 +202,15 @@ char *fsm_settings__get_incompatible_msg(const struct repository *r, > case FSMONITOR_REASON_OK: > goto done; Obviously correct, but the placement of these ... > - case FSMONITOR_REASON_BARE: > + case FSMONITOR_REASON_BARE: { > + char *cwd = xgetcwd(); > + > strbuf_addf(&msg, > _("bare repository '%s' is incompatible with fsmonitor"), > - xgetcwd()); > + cwd); > + free(cwd); > goto done; > + } ... braces are misleading and confusing. > > case FSMONITOR_REASON_ERROR: > strbuf_addf(&msg,
diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c index 658cb79da01..464424a1e92 100644 --- a/fsmonitor-settings.c +++ b/fsmonitor-settings.c @@ -202,11 +202,15 @@ char *fsm_settings__get_incompatible_msg(const struct repository *r, case FSMONITOR_REASON_OK: goto done; - case FSMONITOR_REASON_BARE: + case FSMONITOR_REASON_BARE: { + char *cwd = xgetcwd(); + strbuf_addf(&msg, _("bare repository '%s' is incompatible with fsmonitor"), - xgetcwd()); + cwd); + free(cwd); goto done; + } case FSMONITOR_REASON_ERROR: strbuf_addf(&msg,