diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2016-09-24 10:51:05 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-09-24 10:51:14 +0200 |
| commit | 8ed16fa1005405837cbb6f515333f89dbda876f5 (patch) | |
| tree | 71fd19086d8aac4361da0e63ec525eaa4900fc0c /org.eclipse.jgit/src/org/eclipse | |
| parent | 051d92e202dc75e4197b29c6222ac289217994ec (diff) | |
| parent | 6257e27d4996549dd9f87a16f8aab51108cbef94 (diff) | |
| download | jgit-8ed16fa1005405837cbb6f515333f89dbda876f5.tar.gz jgit-8ed16fa1005405837cbb6f515333f89dbda876f5.zip | |
Merge branch 'stable-4.5'
* stable-4.5:
Fix carrying over flags during a RevWalk
Change-Id: Ibf4573c5664271dfa7a6ecc3ede6eaad749f89d8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java index e67ada6022..1e91006d47 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java @@ -244,7 +244,7 @@ public class RevCommit extends RevObject { if ((p.flags & carry) == carry) continue; p.flags |= carry; - FIFORevQueue q = carryFlags1(c, carry, depth + 1); + FIFORevQueue q = carryFlags1(p, carry, depth + 1); if (q != null) return defer(q, carry, pList, i + 1); } |