Set the new objectid for all diff entries (issue-178)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index af702f2c73f45c8e5bda530cafd56e102a3f636c..ee31b69261a9060de6f66d783dfd66dd7f16fe87 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -11,6 +11,7 @@
 - Fixed bug where permission changes were not visible in the web ui to a logged-in user until the user logged-out and then logged back in again (issue-186)\r
 - Fixed nullpointer on creating a repository with mixed case (issue 185)\r
 - Fixed nullpointer when using web.allowForking = true && git.cacheRepositoryList = false (issue 182)\r
+- Likely fix for commit and commitdiff page failures when a submodule reference changes (issue 178)\r
 - Build project models from the repository model cache, when possible, to reduce page load time (issue 172)\r
 - Fixed loading of Brazilian Portuguese translation from *nix server (github/inaiat)\r
 \r

diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index e11277086bf5ef6746391857d940cb5bdc53368c..815f8b5acc8527c5b39c9f76bcb19e543fbafe44 100644 (file)
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -743,11 +743,7 @@ public class JGitUtils {
                                df.setDetectRenames(true);\r
                                List<DiffEntry> diffs = df.scan(parent.getTree(), commit.getTree());\r
                                for (DiffEntry diff : diffs) {\r
-                                       String objectId = null;\r
-                                       if (FileMode.GITLINK.equals(diff.getNewMode())) {\r
-                                               objectId = diff.getNewId().name();\r
-                                       }\r
-\r
+                                       String objectId = diff.getNewId().name();\r
                                        if (diff.getChangeType().equals(ChangeType.DELETE)) {\r
                                                list.add(new PathChangeModel(diff.getOldPath(), diff.getOldPath(), 0, diff\r
                                                                .getNewMode().getBits(), objectId, commit.getId().getName(), diff\r