diff options
author | Christian Halstrick <christian.halstrick@sap.com> | 2016-09-13 01:29:11 +0200 |
---|---|---|
committer | Christian Halstrick <christian.halstrick@sap.com> | 2016-09-23 11:15:08 +0200 |
commit | dd585b779f4739d5b7b4e69bf45ada10901b6312 (patch) | |
tree | e263df5306abded29cc6ef4e2918c2110f5a740a /org.eclipse.jgit.pgm/plugin.properties | |
parent | aadbb158e10ccc3194c4e7f2c1b3885b3c40571c (diff) | |
download | jgit-dd585b779f4739d5b7b4e69bf45ada10901b6312.tar.gz jgit-dd585b779f4739d5b7b4e69bf45ada10901b6312.zip |
Fix carrying over flags during a RevWalk
There was a bug when carrying over flags from a merge commit to its
non-first parents. The first parent of a merge commit was handled
differently and correct but the non-first parents are handled by a
recursive algorithm. Flags should be copied from the root merge commit
to parent-2, to grandparent-2, ... up to the limit of STACK_DEPTH==500
parents-levels. But the recursive algorithm was always copying only to
the direct parents of the merge commit and not the grand*-parents.
This seems to be no problem when commits are handled in a strict date
order because then copying only one level is no problem if children are
handled before parents. But when commits are not seperated anymore by
distinctive correct dates (e.g. because all commits have the same date)
then it may happen that a merge-parent is handled before the merge
commit and when dealing later with the merge commit one has to copy
flags down to more than one level
Bug: 501211
Change-Id: I2d79a7cf1e3bce21a490905ccd9d5e502d7b8421
Diffstat (limited to 'org.eclipse.jgit.pgm/plugin.properties')
0 files changed, 0 insertions, 0 deletions