diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2019-06-11 13:16:18 +0200 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2019-06-11 14:42:46 +0200 |
| commit | 1cfcde48534dcc9510e6e58d422a78fcd156c85f (patch) | |
| tree | b85cc75f4aa2fd0eb2061908481c679409d25dde /org.eclipse.jgit/pom.xml | |
| parent | fd8d779b5eec614d2cb5a611f2e36f522b34a439 (diff) | |
| download | jgit-1cfcde48534dcc9510e6e58d422a78fcd156c85f.tar.gz jgit-1cfcde48534dcc9510e6e58d422a78fcd156c85f.zip | |
Handle missing "ours" stage in WorkingTreeIterator.hasCrLfInIndex()
In a delete-modify conflict with the deletion as "ours" there may be
no stage 2 in the index. Add appropriate null checks. Add a new test
for this case, and verify that the file gets added with a single LF
after conflict resolution with core.autocrlf=true. This matches the
behavior of canonical git for this case.
Bug: 547724
Change-Id: I1bafdb83d9b78bf85294c78325e818e72fae53bc
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit/pom.xml')
0 files changed, 0 insertions, 0 deletions