git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
To: git@vger.kernel.org
Cc: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Subject: [PATCH v1] merge - rename a shadowed variable in cmd_merge
Date: Fri,  5 Jul 2019 14:32:27 -0600	[thread overview]
Message-ID: <20190705203227.23451-1-eantoranz@gmail.com> (raw)

variable ret used in cmd_merge introduced in d5a35c114ab was already
a local variable used inside a for loop inside the function.

for-local variable is being renamed to ret_try_merge to avoid shadow.
---
 builtin/merge.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index 6e99aead46..972b6c376a 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1587,7 +1587,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		oidclr(&stash);
 
 	for (i = 0; i < use_strategies_nr; i++) {
-		int ret;
+		int ret_try_merge;
 		if (i) {
 			printf(_("Rewinding the tree to pristine...\n"));
 			restore_state(&head_commit->object.oid, &stash);
@@ -1601,26 +1601,26 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		 */
 		wt_strategy = use_strategies[i]->name;
 
-		ret = try_merge_strategy(use_strategies[i]->name,
-					 common, remoteheads,
-					 head_commit);
-		if (!option_commit && !ret) {
+		ret_try_merge = try_merge_strategy(use_strategies[i]->name,
+						common, remoteheads,
+						head_commit);
+		if (!option_commit && !ret_try_merge) {
 			merge_was_ok = 1;
 			/*
 			 * This is necessary here just to avoid writing
 			 * the tree, but later we will *not* exit with
 			 * status code 1 because merge_was_ok is set.
 			 */
-			ret = 1;
+			ret_try_merge = 1;
 		}
 
-		if (ret) {
+		if (ret_try_merge) {
 			/*
 			 * The backend exits with 1 when conflicts are
 			 * left to be resolved, with 2 when it does not
 			 * handle the given merge at all.
 			 */
-			if (ret == 1) {
+			if (ret_try_merge == 1) {
 				int cnt = evaluate_result();
 
 				if (best_cnt <= 0 || cnt <= best_cnt) {
-- 
2.22.0.214.g8dca754b1e


             reply	other threads:[~2019-07-05 20:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-05 20:32 Edmundo Carmona Antoranz [this message]
2019-07-08 20:02 ` [PATCH v1] merge - rename a shadowed variable in cmd_merge Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190705203227.23451-1-eantoranz@gmail.com \
    --to=eantoranz@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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).