Bug 561438 - Unchanged executable files shown as modified if index is non-normalized and core.autocrlf=true
Summary: Unchanged executable files shown as modified if index is non-normalized and c...
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 5.6   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: 5.6.2   Edit
Assignee: Thomas Wolf CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-03-25 04:47 EDT by Thomas Wolf CLA
Modified: 2020-04-03 11:54 EDT (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Wolf CLA 2020-03-25 04:47:11 EDT
With core.autocrlf=true, text files having the executable bit set are considered modified when the index version contains CR-LF line endings.

This is fall-out from commits

* https://git.eclipse.org/r/#/c/127324/ : corrected handling a non-normalized
  index, but only for FileMode.REGULAR_FILE
* https://git.eclipse.org/r/#/c/149390/ : removed an old work-around for non
  normalized index not being handled before

The second change is correct; that work-around really isn't needed anymore. But the first change should also have considered FileMode.EXECUTABLE_FILE.
Comment 1 Eclipse Genie CLA 2020-03-25 04:55:56 EDT
New Gerrit change created: https://git.eclipse.org/r/159980
Comment 2 Thomas Wolf CLA 2020-03-25 12:32:28 EDT
See also https://www.eclipse.org/forums/index.php/t/1102934/ .
Comment 3 David M. Karr CLA 2020-03-25 13:52:22 EDT
What is the approximate time frame for this change being available in a release?
Comment 4 Matthias Sohn CLA 2020-03-25 19:04:28 EDT
(In reply to David M. Karr from comment #3)
> What is the approximate time frame for this change being available in a
> release?

couple of weeks after fix was merged
Comment 5 Eclipse Genie CLA 2020-04-03 03:22:07 EDT
Gerrit change https://git.eclipse.org/r/159980 was merged to [stable-5.6].
Commit: http://git.eclipse.org/c/jgit/jgit.git/commit/?id=24f82b533a1774f03fbedb5f32854aa8858fce6d
Comment 6 Thomas Wolf CLA 2020-04-03 11:54:48 EDT
EGit nightly should have the fix for this. Update site at https://download.eclipse.org/egit/updates-nightly .