Bug 479270 - Checkout paths from another branch is broken in some cases
Summary: Checkout paths from another branch is broken in some cases
Status: NEW
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 4.1   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-10-07 13:49 EDT by Andrey Loskutov CLA
Modified: 2015-10-08 03:04 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Andrey Loskutov CLA 2015-10-07 13:49:24 EDT 
Follow up on https://git.eclipse.org/r/#/c/53827/16.

Two tests were added : 
testCheckoutPathesDeletesFile
testCheckoutPathesReplacesFileByFolder

which shows that jgit has issues while checking out paths from another branch.

testCheckoutPathesReplacesFileByFolder problem is in the CheckoutCommand.checkoutPaths(). It doesn't use DirCacheCheckout but tries to manipulate the working tree directly via checkoutPathsFromIndex() and this one doesn't use the "side" branch information. Since the second test is similar, I expect it also fails in same way.
Comment 1 Eclipse Genie CLA 2015-10-07 15:18:56 EDT 
New Gerrit change created: https://git.eclipse.org/r/57664