diff options
| author | Hugo Arès <hugo.ares@ericsson.com> | 2016-06-15 14:40:05 -0400 |
|---|---|---|
| committer | Hugo Arès <hugo.ares@ericsson.com> | 2016-06-27 08:59:03 -0400 |
| commit | 80cd8554435bdc311d9303677f0796554e5a2dbe (patch) | |
| tree | b512f3904ee1f283a7f2e460a8d606364b1e188a /org.eclipse.jgit/resources/org | |
| parent | 203888f3fa2319412b47c27bb122dc7af77faedd (diff) | |
| download | jgit-80cd8554435bdc311d9303677f0796554e5a2dbe.tar.gz jgit-80cd8554435bdc311d9303677f0796554e5a2dbe.zip | |
Config load should not fail on unsupported or nonexistent include path
1f86350 added initial support for include.path. Relative path and path
with tilde are not yet supported but config load was failing if one of
those 2 unsupported options was encountered. Another problem was that
config load was failing if the include.path file did not exist.
Change the behavior to be consistent with native git. Ignore unsupported
or nonexistent include.path.
Bug: 495505
Bug: 496732
Change-Id: I7285d0e7abb6389ba6983e9c46021bea4344af68
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 0 insertions, 1 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 b71e48b526..ead8359865 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -339,7 +339,6 @@ invalidId0=Invalid id invalidIdLength=Invalid id length {0}; should be {1} invalidIgnoreParamSubmodule=Found invalid ignore param for submodule {0}. invalidIgnoreRule=Exception caught while parsing ignore rule ''{0}''. -invalidIncludedPathInConfigFile=Invalid included path in config file: {0} invalidIntegerValue=Invalid integer value: {0}.{1}={2} invalidKey=Invalid key: {0} invalidLineInConfigFile=Invalid line in config file |