summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.lfs/resources/org
diff options
context:
space:
mode:
authorMarkus Duft <markus.duft@ssi-schaefer.com>2017-11-10 11:10:28 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2018-02-27 18:32:45 +0100
commitc0bb992845e6ba5df9f420739fe9075ed20e9ee2 (patch)
tree23e01159ba98b6d5040e4d47d4fbfdf0dc02e0c5 /org.eclipse.jgit.lfs/resources/org
parent12a589fb577ebbd464cede7b06a7949c84a51350 (diff)
downloadjgit-c0bb992845e6ba5df9f420739fe9075ed20e9ee2.tar.gz
jgit-c0bb992845e6ba5df9f420739fe9075ed20e9ee2.zip
LFS: pre-push upload support
If JGit built in LFS support is enabled for the current repository (or user/system), any existing pre-push hook will cause an exception for the time beeing, as only a single pre-push hook is supported. Thus either native pre-push hooks OR JGit built-in LFS support may be enabled currently, but not both. Change-Id: Ie7d2b90e26e948d9cca3d05a7a19489488c75895 Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.lfs/resources/org')
-rw-r--r--org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties b/org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties
index 19d5ec587f..29cee3a8e0 100644
--- a/org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties
+++ b/org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties
@@ -14,4 +14,5 @@ lfsFailedToGetRepository=failed to get repository {0}
lfsNoDownloadUrl="Need to download object from LFS server but couldn't determine LFS server URL"
serverFailure=When trying to open a connection to {0} the server responded with an error code. rc={1}
wrongAmoutOfDataReceived=While downloading data from the content server {0} {1} bytes have been received while {2} have been expected
-userConfigInvalid="User config file {0} invalid {1}" \ No newline at end of file
+userConfigInvalid="User config file {0} invalid {1}"
+missingLocalObject="Local Object {0} is missing" \ No newline at end of file