diff options
| author | James Moger <james.moger@gitblit.com> | 2012-03-20 19:39:20 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-03-20 19:39:20 -0400 |
| commit | 856091d000befd51967f20e1a7e59ccc59663f99 (patch) | |
| tree | db48afefd39172a578550bedfef3621035c1c229 | |
| parent | f03763b00e90d284b5392c7b3f44a9f6070e1e97 (diff) | |
| download | gitblit-856091d000befd51967f20e1a7e59ccc59663f99.tar.gz gitblit-856091d000befd51967f20e1a7e59ccc59663f99.zip | |
Properly handle renames on incremental indexing
| -rw-r--r-- | src/com/gitblit/LuceneExecutor.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/utils/JGitUtils.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com/gitblit/LuceneExecutor.java b/src/com/gitblit/LuceneExecutor.java index 29a8569d..a425cc3d 100644 --- a/src/com/gitblit/LuceneExecutor.java +++ b/src/com/gitblit/LuceneExecutor.java @@ -622,7 +622,7 @@ public class LuceneExecutor implements Runnable { IndexWriter writer = getIndexWriter(repositoryName);
for (PathChangeModel path : changedPaths) {
// delete the indexed blob
- deleteBlob(repositoryName, branch, path.path);
+ deleteBlob(repositoryName, branch, path.name);
// re-index the blob
if (!ChangeType.DELETE.equals(path.changeType)) {
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java index c39ab715..99b2f738 100644 --- a/src/com/gitblit/utils/JGitUtils.java +++ b/src/com/gitblit/utils/JGitUtils.java @@ -721,6 +721,10 @@ public class JGitUtils { list.add(new PathChangeModel(diff.getOldPath(), diff.getOldPath(), 0, diff
.getNewMode().getBits(), commit.getId().getName(), diff
.getChangeType()));
+ } else if (diff.getChangeType().equals(ChangeType.RENAME)) {
+ list.add(new PathChangeModel(diff.getOldPath(), diff.getNewPath(), 0, diff
+ .getNewMode().getBits(), commit.getId().getName(), diff
+ .getChangeType()));
} else {
list.add(new PathChangeModel(diff.getNewPath(), diff.getNewPath(), 0, diff
.getNewMode().getBits(), commit.getId().getName(), diff
|