search

eclipse-jgit / jgit

JGit, the Java implementation of git
https://www.eclipse.org/jgit/
Other
92 stars 31 forks source link

Possible bug in MergeResult #54

Open nbransby opened 2 months ago

nbransby commented 2 months ago

https://github.com/eclipse-jgit/jgit/blob/7dd522403a51577312b5cfa65f0c5566a49a94eb/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java#L455

is this suppose to be defined outside the loop? otherwise the value of 'endOfChunk' is always zero and the value 'mergeChunk.end' assigned to 'endOfChunk' defined in org.eclipse.jgit.api.MergeResult.addConflict' is never used