Rebase/Cherry-pick with conflict in renamed file
What steps will reproduce the problem?
- Create a new empty repository.
- Create a new file "test.txt" and fill it with some random text.
- Add and commit the file.
- Create a new branch "Featurebranch".
- On branch "master" edit the file "test.txt" in line 1 and commit the changes.
- Checkout "Featurebranch".
- Edit the file "test.txt" and change something different in line 1, so that it will cause a conflict with the changes in master later. Now rename the file to "test_renamed.txt". Commit both changes as single commit.
- Now either rebase onto master or checkout master and cherry-pick the commit from Featurebranch. File "test.txt" will be marked as deleted, file "test_renamed.txt" will be marked having a conflict.
- Mark the conflict as resolved and commit the changes.
What is the expected output? What do you see instead?
The "Git Command Progress" window will show:
git.exe rm --ignore-unmatch [...]
fatal: not removing '.' recursively without -r
git did not exit cleanly (exit code 128)
Also, double clicking on the resolved file "test_renamed.txt" in the "Rebase" window now opens a message:
Failed to checkout file "" of revision to "C:\Users<username>\AppData\Local\Temp\TortoiseGit\FD7A.tmp-03ed335-left".
libgit2 returned: Invalid tree path given
What version of TortoiseGit and Git are you using? On what operating system?
git version 2.7.4.windows.1
Windows 10 Pro (64bit)
Please provide any additional information below.
After aborting the rebase/cherry-pick, steps 8 and 9 can be done in git bash without problems.