summaryrefslogtreecommitdiffstats
path: root/src/com/gitblit/utils/JGitUtils.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-01-13 17:31:29 -0500
committerJames Moger <james.moger@gitblit.com>2013-01-13 17:31:29 -0500
commit19e902522d1d55f042daf076a1f7299b7c220061 (patch)
tree5c6b3ab997ca39111c5196b1d9ac182d9c7a66ec /src/com/gitblit/utils/JGitUtils.java
parent9727511ad07db2c332f164fe399108768457bdae (diff)
downloadgitblit-19e902522d1d55f042daf076a1f7299b7c220061.tar.gz
gitblit-19e902522d1d55f042daf076a1f7299b7c220061.zip
Set the new objectid for all diff entries (issue-178)
Diffstat (limited to 'src/com/gitblit/utils/JGitUtils.java')
-rw-r--r--src/com/gitblit/utils/JGitUtils.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index e1127708..815f8b5a 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -743,11 +743,7 @@ public class JGitUtils {
df.setDetectRenames(true);
List<DiffEntry> diffs = df.scan(parent.getTree(), commit.getTree());
for (DiffEntry diff : diffs) {
- String objectId = null;
- if (FileMode.GITLINK.equals(diff.getNewMode())) {
- objectId = diff.getNewId().name();
- }
-
+ String objectId = diff.getNewId().name();
if (diff.getChangeType().equals(ChangeType.DELETE)) {
list.add(new PathChangeModel(diff.getOldPath(), diff.getOldPath(), 0, diff
.getNewMode().getBits(), objectId, commit.getId().getName(), diff