Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 353867 - File checkout fails when mixed line endings are used and core.autocrlf=true
Summary: File checkout fails when mixed line endings are used and core.autocrlf=true
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 1.1   Edit
Hardware: PC Windows XP
: P3 normal with 3 votes (vote)
Target Milestone: 1.3-M1   Edit
Assignee: Robin Rosenberg CLA
QA Contact:
URL: http://egit.eclipse.org/r/3957
Whiteboard:
Keywords:
Depends on: 301775
Blocks:
  Show dependency tree
 
Reported: 2011-08-04 07:00 EDT by Tomasz Zarna CLA
Modified: 2012-05-23 06:38 EDT (History)
4 users (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 Tomasz Zarna CLA 2011-08-04 07:00:45 EDT 
Steps:
1. Clone a repo, but don't use JGit (assure core.aurocrlf is set to true)
2. Modify a file by adding CRLF line endings
3. Add and commit the file
4. Modify the file again, this time adding LF 
5. Try to checkout the file, discard the changes from 4.
=> SHOULD BE: the working tree should be cleared
=> IS: there is still a change
Comment 1 Tomasz Zarna CLA 2011-09-02 06:41:38 EDT 
Currently, http://egit.eclipse.org/r/#change,3957 contains a failing test case only.
Comment 2 Robin Rosenberg CLA 2011-11-13 14:49:24 EST 
A patch related to /finding/ the core.autocrlf setting on Windows has been
posted to Gerrit http://egit.eclipse.org/r/#change,4430

Thomasz' test is included.
Comment 3 Tomasz Zarna CLA 2011-11-14 04:13:52 EST 
(In reply to comment #2)
> Thomasz' test is included.

Thanks for the update Robin, but I can't find my test being part of the change you mentioned. Your patch set looks more like targeting EGit while the test was for JGit. Do I miss something?
Comment 4 Robin Rosenberg CLA 2011-11-22 16:12:10 EST 
Thomas here is the autocrlf patch,

The other one is merely related http://egit.eclipse.org/r/#change,4530
Comment 5 Tomasz Zarna CLA 2012-05-23 06:38:00 EDT 
Marking as fixed since the test passes with Robin's patch from https://git.eclipse.org/r/#/c/4530/. Merged in on Jan 16, which means 1.3-M1.