diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2021-06-15 00:05:14 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-06-15 00:05:14 +0200 |
| commit | 6a8afeb9f210f92e17b6c525d989c6072984289f (patch) | |
| tree | 130a880a22b83ebfe8bdf3aa7db80b29c510929a /org.eclipse.jgit.pgm | |
| parent | 1aa3cf7f416658a4fafd592732ba70f5a1aee19e (diff) | |
| parent | 01b2c4fc90849f43042ffb0bb40fa3ab69541245 (diff) | |
| download | jgit-6a8afeb9f210f92e17b6c525d989c6072984289f.tar.gz jgit-6a8afeb9f210f92e17b6c525d989c6072984289f.zip | |
Merge branch 'master' into next
* master: (47 commits)
Fix @since from commit 64d0aaa2
Prepare 5.13.0-SNAPSHOT builds
Prepare 5.12.1-SNAPSHOT builds
Teach independent negotiation (no pack file) using an option "wait-for-done"
JGit v5.12.0.202106070339-r
[license-check] Update list of project dependencies
[errorprone] Fix warning InputStreamSlowMultibyteRead
[errorprone] Make operator precedence explicit in OpenSshConfigFile
Update jetty to 9.4.41.v20210516
Prepare 5.1.17-SNAPSHOT builds
JGit v5.1.16.202106041830-r
Update Orbit to R20210602031627
Prepare 5.12.0-SNAPSHOT builds
Fixing visibility for HostEntry constructors.
JGit v5.12.0.202106021050-rc1
Prepare 5.12.0-SNAPSHOT builds
JGit v5.12.0.202106011439-rc1
Clarify operator precedence to fix errorprone error
Prepare 5.12.0-SNAPSHOT builds
Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926
...
Change-Id: I76a1f155201648a62df11a41a9e02d97f522d00f
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java index 822f8998bd..696a924ecf 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java @@ -129,6 +129,9 @@ abstract class RevWalkTextBuiltin extends TextBuiltin { walk.setTreeFilter(AndTreeFilter.create(pathFilter, TreeFilter.ANY_DIFF)); } + if (parents) { + walk.setRewriteParents(true); + } if (revLimiter.size() == 1) walk.setRevFilter(revLimiter.get(0)); |