On Tue, Oct 15, 2019 at 6:25 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Elijah Newren <newren@xxxxxxxxx> writes: > > >> * en/merge-recursive-directory-rename-fixes (2019-10-12) 2 commits > >> (merged to 'next' on 2019-10-15 at ebfdc3ff7b) > >> + merge-recursive: fix merging a subdirectory into the root directory > >> + merge-recursive: clean up get_renamed_dir_portion() > >> > >> A few glitches in the heuristic in merge-recursive to infer file > >> movements based on movements of other files in the same directory > >> have been corrected. > >> > >> Will merge to 'master'. > > > > I'm surprised this one was merged straight down to next; perhaps I > > should have highlighted my plans a bit clearer in the thread? > > My mistake. I am willing to revert the merge to give the topic a > clean slate. Just tell me so. Yeah, let's revert it. > > Also, a very minor point but "glitches" may be misleading; it suggests > > (to me at least) a malfunction rather than a failure to trigger,... > > I used the word to mean a failure to trigger (after all, a heuristic > that fails to trigger when most people would naturelly expect it to > is showing a glitch in that case). A better phrasing, please? Oh, I guess I just had a different connotation for glitch. I guess what you had is fine then, but alternatively we could spell it out just a little more: When all files from some subdirectory were renamed to the root directory, the directory rename heuristics would fail to detect that as a rename/merge of the subdirectory to the root directory, which has been corrected.
