Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Files with ACLs or extended security information incorrectly considered modified #69

Closed
ajoberstar opened this issue Jul 19, 2015 · 5 comments
Milestone

Comments

@ajoberstar
Copy link
Owner

See ajoberstar/gradle-git#124 for details. This will have to be resolved in JGit.

@jzwolak
Copy link
Contributor

jzwolak commented Jul 19, 2015

Perhaps we should update grgit to use the latest jgit and see if the behavior is still present. I'm going to look into doing this right now and see how it goes.

@jzwolak
Copy link
Contributor

jzwolak commented Jul 19, 2015

I built and tested grgit with jgit 4 successfully. All I did was change this line:

def jgitVersion = '4.0.1.201506240215-r'

And the ACL problem is not present in this version of jgit.

Also, if you're trying to reproduce the problem it is subtler than I thought. The problem occurs because the ACL has the executable permission and the unix file permissions do not. Git on the command line was using the unix file permissions while jgit was using the ACL permissions. jgit 4 must be using the unix file permissions since it does not show the file as different when I set up this problem and simply change the version of jgit from 3 to 4 through a forced transitive dependency in gradle.

Please update the version of jgit used by grgit and this problem will be fixed.

@radimk
Copy link

radimk commented Jul 21, 2015

Indeed, newer jgit fixes this problem for me. I only needed to update my buildscript prelude to

buildscript {
    ...
    dependencies {
        classpath 'org.ajoberstar:gradle-git:1.2.0'
        classpath 'org.eclipse.jgit:org.eclipse.jgit:4.0.1.201506240215-r'
        ...
    }
}
And a symlinks that was previously seen as unstaged change is OK now.

@jzwolak
Copy link
Contributor

jzwolak commented Jul 22, 2015

That's correct radimk. I also tested your solution. This will work if Gradle's default dependency resolution (use the newest version when multiple versions are specified) is being used. For users who've changed the dependency resolution this won't work.

@ajoberstar
Copy link
Owner Author

Typed the wrong ID into the commit message, but fixed as of: bd7083a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants