Skip to content

add ignoreSubmodules option - #88772

Merged
João Moreno (joaomoreno) merged 2 commits into
microsoft:masterfrom
Fmstrat:ignore_sub
Nov 4, 2020
Merged

add ignoreSubmodules option#88772
João Moreno (joaomoreno) merged 2 commits into
microsoft:masterfrom
Fmstrat:ignore_sub

Conversation

@Fmstrat

@Fmstrat Ben Curtis (Fmstrat) commented Jan 16, 2020

Copy link
Copy Markdown
Contributor

This PR fixes #88715
(now that it has for when it reaches 20 up-votes)

Purpose: Adds a setting to ignore modifications to submodules in the file tree so that large monorepos don't show numerous modifications.

Testing:

  • Open VSCode to a repo with submodules
  • Go to settings and find the "Ignore Submodules" setting
  • Check and uncheck the box to watch the 'M' convert to an 'S'

@msftclas

Microsoft Contribution License Agreements (msftclas) commented Jan 16, 2020

Copy link
Copy Markdown

CLA assistant check
All CLA requirements met.

@Fmstrat

Ben Curtis (Fmstrat) commented Jan 30, 2020

Copy link
Copy Markdown
Contributor Author

Hey all,

Looks like I'm failing tests in https://dev.azure.com/vscode/VSCode/_build/results?buildId=35951&view=logs&j=0da5d1d9-276d-5173-c4c4-9d4d4ed14fdb&t=47d55512-6160-5b27-084a-e3e9b13d4d4b

.. but I don't see any reason why? Perhaps there is something else in the branch causing that error?

  1) IndexTreeModel setCollapsible:

      AssertionError [ERR_ASSERTION]: Expected values to be loosely deep-equal:
2
should loosely deep-equal
1
      + expected - actual
      -2
      +1  
      at Context.<anonymous> (file:///home/vsts/work/1/s/out/vs/base/test/browser/ui/tree/indexTreeModel.test.js:308:20)

EDIT: I should note, this passed tests when the PR started

@joaomoreno João Moreno (joaomoreno) added the git GIT issues label Jan 31, 2020
@joaomoreno

Copy link
Copy Markdown
Contributor

No worries, these were broken in master, not related to your changes.

@Fmstrat

Copy link
Copy Markdown
Contributor Author

Thanks João Moreno (@joaomoreno), Any idea when this could be merged in?

@joaomoreno

Copy link
Copy Markdown
Contributor

Thanks! 🍻

@joaomoreno
João Moreno (joaomoreno) merged commit e61be08 into microsoft:master Nov 4, 2020
@Fmstrat

Ben Curtis (Fmstrat) commented Dec 7, 2020

Copy link
Copy Markdown
Contributor Author

Oh I see this hit a merge, thanks! Any idea when it will be pushed into the VSCode Repo (Ubuntu)?

EDIT: And now I realize the issue it's tied to is in a milestone https://github.com/microsoft/vscode/milestone/136

@github-actions github-actions Bot locked and limited conversation to collaborators Dec 19, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

git GIT issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Reopen Add Option: "Git: Ignore new commits in submodules"

3 participants