summaryrefslogtreecommitdiff
path: root/compat/msvc.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-06-09 21:16:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-12 10:22:57 -0700
commit5455c33839c6c5d248007ad2b49e8a225e9f47fa (patch)
tree6209ee0fa85e4fb869028155904947a93d970fce /compat/msvc.c
parentmerge-recursive: align labels with their respective code blocks (diff)
downloadtgif-5455c33839c6c5d248007ad2b49e8a225e9f47fa.tar.xz
merge-recursive: clarify the rename_dir/RENAME_DIR meaning
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>
Diffstat (limited to 'compat/msvc.c')
0 files changed, 0 insertions, 0 deletions