Merge branch 'stable-2.15'

* stable-2.15:
  Fix infinite loop in IntraLineLoader

Change-Id: I1632c94b557de4987fe1edf2aba672568c1bc2e2
This commit is contained in:
David Pursehouse
2018-04-13 20:59:46 +09:00
5 changed files with 123 additions and 2 deletions

View File

@@ -21,7 +21,7 @@ import org.eclipse.jgit.lib.ObjectId;
@AutoValue
public abstract class IntraLineDiffKey implements Serializable {
public static final long serialVersionUID = 11L;
public static final long serialVersionUID = 12L;
public static IntraLineDiffKey create(ObjectId aId, ObjectId bId, Whitespace whitespace) {
return new AutoValue_IntraLineDiffKey(aId, bId, whitespace);