aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources/org
diff options
context:
space:
mode:
authorMasaya Suzuki <masayasuzuki@google.com>2018-07-12 08:32:32 -0700
committerJonathan Nieder <jrn@google.com>2018-07-12 12:27:28 -0700
commit579bff6653991e2a2a6c98d440ed00dbd9748a17 (patch)
treed87208f74b54745dccc5a553b2562d77b8d9b7f0 /org.eclipse.jgit/resources/org
parent263a8c1c06f9a237520959934dc0a8b93b56a2f4 (diff)
downloadjgit-579bff6653991e2a2a6c98d440ed00dbd9748a17.tar.gz
jgit-579bff6653991e2a2a6c98d440ed00dbd9748a17.zip
Add API to specify the submodule name
Currently SubmoduleAddCommand always uses the path as submodule name. This patch lets the caller specify a submodule name. SubmoduleUpdateCommand still does not make use of the submodule name (see bug 535027) but Git does. To avoid triggering CVE-2018-11235, do some validation on the name to avoid '..' path components. [jn: fleshed out commit message, mostly to work around flaky CI] Change-Id: I6879c043c6d7973556e2080387f23c246e3d76a5 Signed-off-by: Masaya Suzuki <masayasuzuki@google.com> Signed-off-by: Jonathan Nieder <jrn@google.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index ee5ba20b29..34c90f9773 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -376,6 +376,7 @@ invalidLineInConfigFile=Invalid line in config file
invalidLineInConfigFileWithParam=Invalid line in config file: {0}
invalidModeFor=Invalid mode {0} for {1} {2} in {3}.
invalidModeForPath=Invalid mode {0} for path {1}
+invalidNameContainsDotDot=Invalid name (contains ".."): {1}
invalidObject=Invalid {0} {1}: {2}
invalidOldIdSent=invalid old id sent
invalidPacketLineHeader=Invalid packet line header: {0}