diff options
| author | Alex Spradlin <alexaspradlin@google.com> | 2020-03-12 09:04:36 -0700 |
|---|---|---|
| committer | Alex Spradlin <alexaspradlin@google.com> | 2020-03-12 09:04:36 -0700 |
| commit | cf8c84c6d1748fa3402fd0857c87e51765d685c0 (patch) | |
| tree | 4b9792f426b8d76bc5f2a9a058570de329269e85 /org.eclipse.jgit.test | |
| parent | 24fb3a67b5cb29081ff0c0986dea115bec338353 (diff) | |
| download | jgit-cf8c84c6d1748fa3402fd0857c87e51765d685c0.tar.gz jgit-cf8c84c6d1748fa3402fd0857c87e51765d685c0.zip | |
RevWalk: fix bad topo flags error message
The error message for an Exception thrown by StartGenerator when given
both the TOPO flag and the TOPO_KEEP_BRANCH_TOGETHER flag mentions a
non-existent flag, TOPO_NON_INTERMIX. The error message was introduced
in commit e498d43.
Replace TOPO_NON_INTERMIX with TOPO_KEEP_BRANCH_TOGETHER in the error
message of an Exception thrown by the StartGenerator when the TOPO flag
is provided together with the TOPO_KEEP_BRANCH_TOGETHER flag.
Signed-off-by: Alex Spradlin <alexaspradlin@google.com>
Change-Id: Id24640dc08e96a196508fe38ce144aa7e035082f
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java index 18ea2c83ce..8af6747739 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java @@ -310,7 +310,7 @@ public class RevWalkSortTest extends RevWalkTestCase { fail("did not throw IllegalStateException"); } catch (IllegalStateException e) { assertEquals( - JGitText.get().cannotCombineTopoSortWithTopoNonIntermixSort, + JGitText.get().cannotCombineTopoSortWithTopoKeepBranchTogetherSort, e.getMessage()); } } |