diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-10-22 21:22:50 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-10-23 11:32:49 +0900 |
| commit | 49b8133a9ece199a17db8bb2545202c6eac67485 (patch) | |
| tree | 81f3495b13d63be99a17fa849f71c596d56f4f3f /credential-cache--daemon.c | |
| parent | merge-recursive: clean up get_renamed_dir_portion() (diff) | |
| download | tgif-49b8133a9ece199a17db8bb2545202c6eac67485.tar.xz | |
merge-recursive: fix merging a subdirectory into the root directory
We allow renaming all entries in e.g. a directory named z/ into a
directory named y/ to be detected as a z/ -> y/ rename, so that if the
other side of history adds any files to the directory z/ in the mean
time, we can provide the hint that they should be moved to y/.
There is no reason to not allow 'y/' to be the root directory, but the
code did not handle that case correctly. Add a testcase and the
necessary special checks to support this case.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'credential-cache--daemon.c')
0 files changed, 0 insertions, 0 deletions