[PATCH v1] merge - rename a shadowed variable in cmd_merge

From

Edmundo Carmona Antoranz <eantoranz@gmail.com>

Date

Jul 5, 2019, 20:32 UTC

Message-ID

<20190705203227.23451-1-eantoranz@gmail.com>

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