diff options
| author | Matthias Sohn | 2018-10-06 00:25:17 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2018-10-06 00:26:05 +0000 |
| commit | f016e3247180ac0858409d71a47107fc49e0ae6c (patch) | |
| tree | a3f669bb5f7ba88f1a90ed7f0dd18fcfedd26b1a /org.eclipse.jgit/.settings/.api_filters | |
| parent | 6b82c9ff7f208afacce80f522e5e7eea97ec9f12 (diff) | |
| parent | c0a973657f13fa72e4be0f42c02969f98ac69641 (diff) | |
| download | jgit-f016e3247180ac0858409d71a47107fc49e0ae6c.tar.gz jgit-f016e3247180ac0858409d71a47107fc49e0ae6c.tar.xz jgit-f016e3247180ac0858409d71a47107fc49e0ae6c.zip | |
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10:
Prepare 4.9.7-SNAPSHOT builds
JGit v4.9.6.201810051924-r
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: Ibd759f5d425f714e79b3137ff8e5b0f989933de0
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings/.api_filters')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index e6e3309225..eb2ed7dabb 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -17,6 +17,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/util/FS.java" type="org.eclipse.jgit.util.FS"> <filter id="1141899266"> <message_arguments> |