undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: clarify the rename_dir/RENAME_DIR meaning

Browse Source 
We had an enum of rename types which included RENAME_DIR; this name felt
misleading since it was not about an entire directory but was a status for
each individual file add that occurred within a renamed directory.

Since this type is for signifying that the files in question were being
renamed due to directory rename detection, rename this enum value to
RENAME_VIA_DIR.

Make a similar change to the conflict_rename_dir() function, and add a
comment to the top of that function explaining its purpose (it may not be
quite as obvious as for the other conflict_rename_*() functions).

Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-06-09 21:16:14 -07:00 committed by Junio C Hamano
parent 9366536583
commit 5455c33839
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
merge-recursive.c
View File

@ -181,7 +181,7 @@ static int oid_eq(const struct object_id *a, const struct object_id *b)
enum rename_type {
RENAME_NORMAL = 0,
RENAME_DIR,
RENAME_VIA_DIR,
RENAME_DELETE,
RENAME_ONE_FILE_TO_ONE,
RENAME_ONE_FILE_TO_TWO,
@ -1410,11 +1410,17 @@ static int merge_file_one(struct merge_options *o,
return merge_file_1(o, &one, &a, &b, path, branch1, branch2, mfi);
}
static int conflict_rename_dir(struct merge_options *o,
struct diff_filepair *pair,
const char *rename_branch,
const char *other_branch)
static int conflict_rename_via_dir(struct merge_options *o,
struct diff_filepair *pair,
const char *rename_branch,
const char *other_branch)
{
/*
* Handle file adds that need to be renamed due to directory rename
* detection. This differs from handle_rename_normal, because
* there is no content merge to do; just move the file into the
* desired final location.
*/
const struct diff_filespec *dest = pair->two;
if (!o->call_depth && would_lose_untracked(dest->path)) {
@ -2692,7 +2698,7 @@ static int process_renames(struct merge_options *o,
if (oid_eq(&src_other.oid, &null_oid) &&
ren1->add_turned_into_rename) {
setup_rename_conflict_info(RENAME_DIR,
setup_rename_conflict_info(RENAME_VIA_DIR,
ren1->pair,
NULL,
branch1,
@ -3138,12 +3144,12 @@ static int process_entry(struct merge_options *o,
b_oid, b_mode,
conflict_info);
break;
case RENAME_DIR:
case RENAME_VIA_DIR:
clean_merge = 1;
if (conflict_rename_dir(o,
conflict_info->pair1,
conflict_info->branch1,
conflict_info->branch2))
if (conflict_rename_via_dir(o,
conflict_info->pair1,
conflict_info->branch1,
conflict_info->branch2))
clean_merge = -1;
break;
case RENAME_DELETE: