merge-recursive: use 'ci' for rename_conflict_info variable name
We used a couple different names, but used 'ci' the most. Use the same variable name throughout for a little extra consistency. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Apr 5, 2019 at 08:00 UTC
043622b2e9fd7b5e4b07404c4896080a602cc139
1 file changed
+18
-23
merge-recursive.c
+18
-23
@@ -3098,7 +3098,7 @@ static int handle_content_merge(struct merge_options *opt,
3098
struct object_id *o_oid, int o_mode,
3099
struct object_id *a_oid, int a_mode,
3100
struct object_id *b_oid, int b_mode,
3101
- struct rename_conflict_info *rename_conflict_info)
3101
+ struct rename_conflict_info *ci)
3102
{
3103
const char *reason = _("content");
3104
const char *path1 = NULL, *path2 = NULL;
@@ -3118,17 +3118,17 @@ static int handle_content_merge(struct merge_options *opt,
3118
oidcpy(&b.oid, b_oid);
3119
b.mode = b_mode;
3120
3121
- if (rename_conflict_info) {
3122
- struct diff_filepair *pair1 = rename_conflict_info->pair1;
3121
+ if (ci) {
3122
+ struct diff_filepair *pair1 = ci->pair1;
3123
3124
- path1 = (opt->branch1 == rename_conflict_info->branch1) ?
3124
+ path1 = (opt->branch1 == ci->branch1) ?
3125
pair1->two->path : pair1->one->path;
3126
- /* If rename_conflict_info->pair2 != NULL, we are in
3126
+ /* If ci->pair2 != NULL, we are in
3127
* RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
3128
* normal rename.
3129
*/
3130
- path2 = (rename_conflict_info->pair2 ||
3131
- opt->branch2 == rename_conflict_info->branch1) ?
3130
+ path2 = (ci->pair2 ||
3131
+ opt->branch2 == ci->branch1) ?
3132
pair1->two->path : pair1->one->path;
3133
one.path = pair1->one->path;
3134
a.path = (char *)path1;
@@ -3180,7 +3180,7 @@ static int handle_content_merge(struct merge_options *opt,
3180
reason = _("submodule");
3181
output(opt, 1, _("CONFLICT (%s): Merge conflict in %s"),
3182
reason, path);
3183
- if (rename_conflict_info && !df_conflict_remains)
3183
+ if (ci && !df_conflict_remains)
3184
if (update_stages(opt, path, &one, &a, &b))
3185
return -1;
3186
}
@@ -3206,7 +3206,7 @@ static int handle_content_merge(struct merge_options *opt,
3206
}
3207
3208
}
3209
- new_path = unique_path(opt, path, rename_conflict_info->branch1);
3209
+ new_path = unique_path(opt, path, ci->branch1);
3210
if (is_dirty) {
3211
output(opt, 1, _("Refusing to lose dirty file at %s"),
3212
path);
@@ -3251,8 +3251,8 @@ static int process_entry(struct merge_options *opt,
3251
3252
entry->processed = 1;
3253
if (entry->rename_conflict_info) {
3254
- struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
3255
- switch (conflict_info->rename_type) {
3254
+ struct rename_conflict_info *ci = entry->rename_conflict_info;
3255
+ switch (ci->rename_type) {
3256
case RENAME_NORMAL:
3257
case RENAME_ONE_FILE_TO_ONE:
3258
clean_merge = handle_rename_normal(opt,
@@ -3260,13 +3260,11 @@ static int process_entry(struct merge_options *opt,
3260
o_oid, o_mode,
3261
a_oid, a_mode,
3262
b_oid, b_mode,
3263
- conflict_info);
3263
+ ci);
3264
break;
3265
case RENAME_VIA_DIR:
3266
clean_merge = 1;
3267
- if (handle_rename_via_dir(opt,
3268
- conflict_info->pair1,
3269
- conflict_info->branch1))
3267
+ if (handle_rename_via_dir(opt, ci->pair1, ci->branch1))
3268
clean_merge = -1;
3269
break;
3270
case RENAME_ADD:
@@ -3276,19 +3274,17 @@ static int process_entry(struct merge_options *opt,
3274
* two-way merged cleanly with the added file, I
3275
* guess it's a clean merge?
3276
*/
3279
- clean_merge = handle_rename_add(opt, conflict_info);
3277
+ clean_merge = handle_rename_add(opt, ci);
3278
break;
3279
case RENAME_DELETE:
3280
clean_merge = 0;
3283
- if (handle_rename_delete(opt,
3284
- conflict_info->pair1,
3285
- conflict_info->branch1,
3286
- conflict_info->branch2))
3281
+ if (handle_rename_delete(opt, ci->pair1,
3282
+ ci->branch1, ci->branch2))
3283
clean_merge = -1;
3284
break;
3285
case RENAME_ONE_FILE_TO_TWO:
3286
clean_merge = 0;
3291
- if (handle_rename_rename_1to2(opt, conflict_info))
3287
+ if (handle_rename_rename_1to2(opt, ci))
3288
clean_merge = -1;
3289
break;
3290
case RENAME_TWO_FILES_TO_ONE:
@@ -3298,8 +3294,7 @@ static int process_entry(struct merge_options *opt,
3294
* can then be two-way merged cleanly, I guess it's
3295
* a clean merge?
3296
*/
3301
- clean_merge = handle_rename_rename_2to1(opt,
3302
- conflict_info);
3297
+ clean_merge = handle_rename_rename_2to1(opt, ci);
3298
break;
3299
default:
3300
entry->processed = 0;