source.dussan.org Git - jgit.git/commit

author	Alex Spradlin <alexaspradlin@google.com>
	Thu, 12 Mar 2020 16:04:36 +0000 (09:04 -0700)
committer	Alex Spradlin <alexaspradlin@google.com>
	Thu, 12 Mar 2020 16:04:36 +0000 (09:04 -0700)
commit	cf8c84c6d1748fa3402fd0857c87e51765d685c0
tree	4b9792f426b8d76bc5f2a9a058570de329269e85	tree \| snapshot
parent	24fb3a67b5cb29081ff0c0986dea115bec338353	commit \| diff

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

org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java		diff \| blob \| history
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties		diff \| blob \| history
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java		diff \| blob \| history
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java		diff \| blob \| history