From ade8af729ce5c30d3c89124893b7fefbce954f08 Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Sun, 19 May 2013 15:19:35 +0200
Subject: [PATCH] Apply tree filter marks when pairing DiffEntry for renames

When using a RenameDetector to generate new DiffEntries after using
DiffEntry.scan, the treeFilterMarks of the original entries were lost.
Now it combines the marks from src and dst.

See EGit bug 335082 where this is used.

Change-Id: I72b34b10ca12e3a6bd10ce44f4fa05b193fc52cc
---
 org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java
index a3d4e09d7..06b2aec06 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java
@@ -308,6 +308,8 @@ public class DiffEntry {
 		r.changeType = changeType;
 		r.score = score;
 
+		r.treeFilterMarks = src.treeFilterMarks | dst.treeFilterMarks;
+
 		return r;
 	}