Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 380
    • Issues 380
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #2785
Closed
Open
Issue created Jun 13, 2016 by radiat-r@radiat-r

Rebase/Cherry-pick with conflict in renamed file

What steps will reproduce the problem?

  1. Create a new empty repository.
  2. Create a new file "test.txt" and fill it with some random text.
  3. Add and commit the file.
  4. Create a new branch "Featurebranch".
  5. On branch "master" edit the file "test.txt" in line 1 and commit the changes.
  6. Checkout "Featurebranch".
  7. 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.
  8. 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.
  9. 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?

TortoiseGit 2.1.0.0

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.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking