diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-06 01:16:08 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-06 01:16:08 +0200 |
| commit | 7d94b446fe0732bc74ae90abed4599c816166664 (patch) | |
| tree | e6eef0ba4ae8108b193e602f97fbaa1550de65a0 /org.eclipse.jgit/.settings | |
| parent | ffdaa0ff8ff8ced99df4f6fc75855f7f28d3a838 (diff) | |
| parent | a8bd7dcc5835864da48e9fb4ade434ae5d4600b2 (diff) | |
| download | jgit-7d94b446fe0732bc74ae90abed4599c816166664.tar.gz jgit-7d94b446fe0732bc74ae90abed4599c816166664.zip | |
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8:
Prepare 4.7.6-SNAPSHOT builds
JGit v4.7.5.201810051826-r
BaseReceivePack: Validate incoming .gitmodules files
ObjectChecker: Report .gitmodules files found in the pack
SubmoduleAddCommand: Reject submodule URIs that look like cli options
Change-Id: Ia7a826399d8d5b8a0eb7169b40e98a6f5c207a4c
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index e9511890fd..9bcc8213c7 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -3,7 +3,7 @@ <resource path="META-INF/MANIFEST.MF"> <filter id="924844039"> <message_arguments> - <message_argument value="4.9.4"/> + <message_argument value="4.9.6"/> <message_argument value="4.9.0"/> </message_arguments> </filter> @@ -32,6 +32,22 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry"> + <filter id="1109393411"> + <message_arguments> + <message_argument value="4.7.5"/> + <message_argument value="org.eclipse.jgit.lib.GitmoduleEntry"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/lib/ObjectChecker.java" type="org.eclipse.jgit.lib.ObjectChecker"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="4.7.5"/> + <message_argument value="getGitsubmodules()"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger"> <filter id="1141899266"> <message_arguments> |