diff options
| author | Philipp Thun <philipp.thun@sap.com> | 2010-12-14 11:31:41 +0100 |
|---|---|---|
| committer | Philipp Thun <philipp.thun@sap.com> | 2010-12-14 11:31:41 +0100 |
| commit | bab053afddbbc26203da54af2dface6ed657f116 (patch) | |
| tree | dd78fc781524a320a327416f78b1148139cb25a9 /org.eclipse.jgit | |
| parent | c6ca443b61372d73a7f1438c995713bad39b5277 (diff) | |
| download | jgit-bab053afddbbc26203da54af2dface6ed657f116.tar.gz jgit-bab053afddbbc26203da54af2dface6ed657f116.zip | |
Do not rely on filemode differences in case of symbolic links
When checking whether a file in the working tree has been modified -
WorkingTreeIterator.isModified() - we should not trust the filemode
in case of symbolic links, but check the timestamp and also the
content, if requested. Without this fix symlinks will always be shown
in EGit as modified files on Windows systems.
Change-Id: I367c807df5a7e85e828ddacff7fee7901441f187
Signed-off-by: Philipp Thun <philipp.thun@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index 6365c119c2..69d9b22d1e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -556,15 +556,19 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { // bitwise presentation of modeDiff we'll have a '1' when the two modes // differ at this position. int modeDiff = getEntryRawMode() ^ entry.getRawMode(); - // Ignore the executable file bits if checkFilemode tells me to do so. - // Ignoring is done by setting the bits representing a EXECUTABLE_FILE - // to '0' in modeDiff - if (!state.options.isFileMode()) - modeDiff &= ~FileMode.EXECUTABLE_FILE.getBits(); - if (modeDiff != 0) - // Report a modification if the modes still (after potentially - // ignoring EXECUTABLE_FILE bits) differ - return true; + + // Do not rely on filemode differences in case of symbolic links + if (modeDiff != 0 && !FileMode.SYMLINK.equals(entry.getRawMode())) { + // Ignore the executable file bits if WorkingTreeOptions tell me to + // do so. Ignoring is done by setting the bits representing a + // EXECUTABLE_FILE to '0' in modeDiff + if (!state.options.isFileMode()) + modeDiff &= ~FileMode.EXECUTABLE_FILE.getBits(); + if (modeDiff != 0) + // Report a modification if the modes still (after potentially + // ignoring EXECUTABLE_FILE bits) differ + return true; + } // Git under windows only stores seconds so we round the timestamp // Java gives us if it looks like the timestamp in index is seconds |