Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

status: do not get confused by submodules in excluded directories #1179

Merged
merged 1 commit into from
May 25, 2017
Merged

status: do not get confused by submodules in excluded directories #1179

merged 1 commit into from
May 25, 2017

Conversation

dscho
Copy link
Member

@dscho dscho commented May 24, 2017

We meticulously pass the exclude flag to the treat_directory()
function so that we can indicate that files in it are excluded rather
than untracked when recursing.

But we did not yet treat submodules the same way.

Signed-off-by: Johannes Schindelin [email protected]

@dscho
status: do not get confused by submodules in excluded directories
6eb92ce 
We meticulously pass the `exclude` flag to the `treat_directory()`
function so that we can indicate that files in it are excluded rather
than untracked when recursing.

But we did not yet treat submodules the same way.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
Copy link
Member Author

dscho commented May 25, 2017

I was waiting for the test suite to pass, to confirm that I did not do anything stupid.

@dscho dscho merged commit 51efe4d into git-for-windows:master May 25, 2017
@dscho dscho added this to the v2.13.0(1) milestone May 25, 2017
@dscho dscho self-assigned this May 25, 2017
dscho added a commit that referenced this pull request May 29, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
4f3c91b 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request May 29, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
9c3be4a 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request May 29, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
b17f6fe 
status: do not get confused by submodules in excluded directories
dscho added a commit to git-for-windows/build-extra that referenced this pull request May 30, 2017
@dscho
Mention Bug Fix in release notes
6179888 
`git status -uno` [now treats submodules in ignored directories
correctly](git-for-windows/git#1179).

Signed-off-by: Johannes Schindelin <[email protected]>
dscho added a commit that referenced this pull request May 30, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
5b9ede1 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request May 30, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
d391c74 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request May 30, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
9583eb7 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request May 30, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
08eac55 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Jun 5, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
814bf77 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Jun 7, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
3116e45 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Jun 7, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
4e84a66 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Jun 7, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
b793699 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Jun 7, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
e3a6d3c 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Jun 19, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
77306ac 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Jun 19, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
850521d 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Jun 20, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
aece3de 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Jun 21, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
a986e15 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Jun 21, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
c1c4dea 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Jun 21, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
ba8e81a 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Jun 25, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
f670ec9 
status: do not get confused by submodules in excluded directories
dscho added a commit to dscho/git that referenced this pull request Jun 26, 2017
@dscho
Merge pull request git-for-windows#1179 from dscho/submodule-in-excluded
80153bd 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Jul 5, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
bdbc2c2 
status: do not get confused by submodules in excluded directories
dscho added a commit to dscho/git that referenced this pull request Jul 13, 2017
@dscho
Merge pull request git-for-windows#1179 from dscho/submodule-in-excluded
257d619 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Sep 11, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
1b553f7 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Sep 11, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
a62dbc2 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Sep 11, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
324f40f 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Sep 11, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
0f891c6 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Sep 12, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
3ed870a 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Sep 19, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
7342698 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Sep 20, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
6eb0f85 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Sep 20, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
cfb6f3c 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Sep 21, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
e3dadad 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Sep 21, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
4181930 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Sep 26, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
9df7da0 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Sep 26, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
e3ac2e5 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Sep 26, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
3ce6f2d 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 17, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
aa72043 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 19, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
2be457b 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 19, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
8940484 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 19, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
9840731 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 19, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
4b85023 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 19, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
6687533 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Oct 20, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
6ab4a0c 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Oct 20, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
5de2a92 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Oct 20, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
5768fa7 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 20, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
4093af9 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Oct 21, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
58c0c68 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 23, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
a3b2e35 
status: do not get confused by submodules in excluded directories
git-for-windows-ci pushed a commit that referenced this pull request Oct 24, 2017
Merge pull request #1179 from dscho/submodule-in-excluded
b906c27 
status: do not get confused by submodules in excluded directories
dscho added a commit that referenced this pull request Oct 30, 2017
@dscho
Merge pull request #1179 from dscho/submodule-in-excluded
c6a111e 
status: do not get confused by submodules in excluded directories
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dscho dscho

Labels
None yet
Projects
None yet
Milestone
v2.13.1
Development

Successfully merging this pull request may close these issues.
1 participant
@dscho