Bug 538563 - FILE-GITLINK conflict is reported by IndexDiff as modification even if ignoreSubmodules=all
Summary: FILE-GITLINK conflict is reported by IndexDiff as modification even if ignore...
Status: NEW
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-09-03 15:42 EDT by Thomas Wolf CLA
Modified: 2019-03-08 11:23 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Wolf CLA 2018-09-03 15:42:39 EDT 
See IndexDiffSubmoduleTest.testSubmoduleReplacedByFile() and comments in Gerrit at [1]: canonical git reports a clean workspace if a submodule directory is replaced by a file and "git status --ignore-submodules=all" is invoked. JGit reports a modification.

[1] https://git.eclipse.org/r/#/c/128057/1/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffSubmoduleTest.java@162
Comment 1 Eclipse Genie CLA 2018-09-08 07:51:41 EDT 
New Gerrit change created: https://git.eclipse.org/r/128953
Comment 2 Daniel Veihelmann CLA 2019-03-08 11:23:02 EST 
As mentioned in the linked ticket 545162, the current fix on Gerrit does *not* appear to resolve a very similar bug occurring when a submodule is deleted and replaced by a file that has a root folder named like the now-deleted submodule.