From 5e867397df3258ff41e61d00d6b827f26ce181f5 Mon Sep 17 00:00:00 2001 From: Dave Watson Date: Tue, 26 Jun 2007 22:00:32 -0400 Subject: [PATCH] Doesn't look at execute bit for difference if we can't actually check it On Java 5, this was causing erroneous differences, when the files were not actually changed, but rather we just couldn't manage to check it. Signed-off-by: Dave Watson --- org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java b/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java index 37580110..b6312e75 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java @@ -391,13 +391,13 @@ public class GitIndex { // if (file.canExecute() != FileMode.EXECUTABLE_FILE.equals(mode)) // return true; if (FileMode.EXECUTABLE_FILE.equals(mode)) { - if (!File_canExecute(file)) + if (!File_canExecute(file)&& canExecute != null) return true; } else { if (FileMode.REGULAR_FILE.equals(mode)) { if (!file.isFile()) return true; - if (File_canExecute(file)) + if (File_canExecute(file) && canExecute != null) return true; } else { if (FileMode.SYMLINK.equals(mode)) { -- 2.11.4.GIT