summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources/org/eclipse
diff options
context:
space:
mode:
authorMarc Strapetz <marc.strapetz@syntevo.com>2017-01-10 16:28:54 +0100
committerMarc Strapetz <marc.strapetz@syntevo.com>2017-01-15 15:05:51 +0100
commit1c4b3f8c45fe2bbcc0ea6aa9ffee107312b37310 (patch)
tree19c28b9630d1e6f91542a17b155bb6a31ad36f21 /org.eclipse.jgit/resources/org/eclipse
parentd3148f9410b071edd4a4c85d2a43d1fa2574b0d2 (diff)
downloadjgit-1c4b3f8c45fe2bbcc0ea6aa9ffee107312b37310.tar.gz
jgit-1c4b3f8c45fe2bbcc0ea6aa9ffee107312b37310.zip
Fix possible InvalidObjectIdException in ObjectDirectory
ObjectDirectory.getShallowCommits should throw an IOException instead of an InvalidArgumentException if invalid SHAs are present in .git/shallow (as this file is usually edited by a human). Change-Id: Ia3a39d38f7aec4282109c7698438f0795fbec905 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
-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 b9b74bfc21..eb6f3a0aae 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -31,6 +31,7 @@ badGroupHeader=Bad group header
badObjectType=Bad object type: {0}
badRef=Bad ref: {0}: {1}
badSectionEntry=Bad section entry: {0}
+badShallowLine=Bad shallow line: {0}
bareRepositoryNoWorkdirAndIndex=Bare Repository has neither a working tree, nor an index
base64InputNotProperlyPadded=Base64 input not properly padded.
baseLengthIncorrect=base length incorrect