summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2017-04-11 00:54:06 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2017-04-11 00:54:16 +0200
commitcc0dbbae435d4101a9253e2fc527fb2909278f17 (patch)
tree3964cfffc4c582d792576a0b19f96ebd3fb9e7d0 /org.eclipse.jgit/resources
parentfc24c5e18d654164f1616bb5a30cffd146b9e8b4 (diff)
parentf17ec3928c45d7f5170e92b4e0e1f7390de5fff2 (diff)
downloadjgit-cc0dbbae435d4101a9253e2fc527fb2909278f17.tar.gz
jgit-cc0dbbae435d4101a9253e2fc527fb2909278f17.zip
Merge branch 'stable-4.7'
* stable-4.7: Cleanup and test trailing slash handling in ManifestParser ManifestParser: Throw exception if remote does not have fetch attribute Change-Id: Ia9dc3110bcbdae05175851ce647ffd11c542f4c0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/gitrepo/internal/RepoText.properties1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/gitrepo/internal/RepoText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/gitrepo/internal/RepoText.properties
index 7443ad32f0..e942038a3d 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/gitrepo/internal/RepoText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/gitrepo/internal/RepoText.properties
@@ -3,6 +3,7 @@ errorIncludeFile=Error: unable to read include file {0}
errorIncludeNotImplemented=Error: <include> tag not supported as no callback defined.
errorNoDefault=Error: no default remote in manifest file.
errorNoDefaultFilename=Error: no default remote in manifest file {0}.
+errorNoFetch=Error: remote {0} is missing fetch attribute.
errorParsingManifestFile=Error occurred during parsing manifest file.
errorRemoteUnavailable=Error remote {0} is unavailable.
invalidManifest=Invalid manifest.