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
