]> source.dussan.org Git - jgit.git/commit
IndexDiff/SubmoduleWalk: handle submodule.<name>.ignore correctly 07/151407/4
authorThomas Wolf <thomas.wolf@paranor.ch>
Mon, 21 Oct 2019 20:28:50 +0000 (22:28 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 15 Nov 2019 22:48:44 +0000 (14:48 -0800)
commit7a3b93cbedc9c4070c19ee8878adeb8455b61c21
treebc381ecba53594b318d1d072d4c59b4f081121d6
parent83b9b84e4a09e7c10d4b35cca7987e140cbf68bd
IndexDiff/SubmoduleWalk: handle submodule.<name>.ignore correctly

IndexDiff would apply ignore mode ALL from .gitmodules to all remaining
submodules, and would ignore other settings from .gitignore and always
apply the setting defined on the IndexDiff instead. Correct that.

In canonical git the ignore setting from .gitmodules can also be
overridden by .git/config.[1] Implement that override in SubmoduleWalk.

[1] https://git-scm.com/docs/gitmodules#Documentation/gitmodules.txt-submoduleltnamegtignore

Bug: 521613
Change-Id: I9199fd447e41c7838924856dce40678370b66395
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffSubmoduleTest.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java