From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 30/32] ident.c: fix LGTM warning on the possible abuse of the '=' operator
Date: Mon, 4 Nov 2019 09:59:21 +0000 [thread overview]
Message-ID: <20191104095923.116086-1-gitter.spiros@gmail.com> (raw)
Fix the LGTM warning of the rule that finds uses of the assignment
operator = in places where the equality operator == would
make more sense.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
---
ident.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/ident.c b/ident.c
index e666ee4e59..07f2f03b0a 100644
--- a/ident.c
+++ b/ident.c
@@ -172,12 +172,15 @@ const char *ident_default_email(void)
strbuf_addstr(&git_default_email, email);
committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
- } else if ((email = query_user_email()) && email[0]) {
- strbuf_addstr(&git_default_email, email);
- free((char *)email);
- } else
- copy_email(xgetpwuid_self(&default_email_is_bogus),
+ } else {
+ email = query_user_email();
+ if (email && email[0]) {
+ strbuf_addstr(&git_default_email, email);
+ free((char *)email);
+ } else
+ copy_email(xgetpwuid_self(&default_email_is_bogus),
&git_default_email, &default_email_is_bogus);
+ }
strbuf_trim(&git_default_email);
}
return git_default_email.buf;
--
2.24.0.rc0.467.g566ccdd3e4.dirty
next reply other threads:[~2019-11-04 9:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 9:59 Elia Pinto [this message]
2019-11-04 9:59 ` [PATCH 31/32] commit-graph.c: fix code that could convert the result of an integer multiplication to a larger type Elia Pinto
2019-11-06 2:23 ` Junio C Hamano
2019-11-07 2:23 ` Danh Doan
2019-11-07 3:37 ` Junio C Hamano
2019-11-07 4:06 ` Danh Doan
2019-11-07 12:49 ` Johannes Schindelin
2019-11-07 12:45 ` Johannes Schindelin
2019-11-04 9:59 ` [PATCH 32/32] date.c: fix code that may overflow 'int' before it is converted to 'time_t' Elia Pinto
2019-11-04 10:26 ` [PATCH 30/32] ident.c: fix LGTM warning on the possible abuse of the '=' operator SZEDER Gábor
2019-11-04 13:55 ` Elia Pinto
2019-11-04 15:11 ` Phillip Wood
2019-11-04 19:55 ` Elia Pinto
2019-11-06 2:16 ` Junio C Hamano
2019-11-06 11:32 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191104095923.116086-1-gitter.spiros@gmail.com \
--to=gitter.spiros@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).