Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Never consider submodules for stashing #1881

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.

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

Merged
merged 3 commits into from
Sep 30, 2013
Merged

Conversation

jspahrsummers
Copy link
Contributor

This matches the behavior of git stash save in my testing.

jspahrsummers added a commit to libgit2/objective-git that referenced this pull request Sep 28, 2013
@ben
Copy link
Member

ben commented Sep 28, 2013

Any way we can document this new behavior with a test?

@jspahrsummers
Copy link
Contributor Author

I took some influence from the diff::submodules test and the rest of the stash tests, and kinda smashed them together. Let me know if that works. 🔍

@ben
Copy link
Member

ben commented Sep 29, 2013

I like it, thanks! 🎇 Anybody else have an opinion?

@carlosmn
Copy link
Member

The janky build on Windows reported a failure in the tests. Has it been checked out?

stash::submodules::does_not_stash_modified_submodules [c:\program files (x86)\jenkins\jobs\libgit2-win32-msvc-f5ec724b4d32\workspace\tests-clar\clar/fs.h:76]
Expression is not true: DeleteFileW(buffer)

@vmg
Copy link
Member

vmg commented Sep 30, 2013

Looks like a file access issue in Windows. What's the janky test exactly? We should re-run it.

@carlosmn
Copy link
Member

It's this one https://janky.rs.github.com/634985/output which I think is the only one that's been run. No idea if it's just the CI being dirty.

@jspahrsummers
Copy link
Contributor Author

Yeah, I've no idea what that failure means. If it's a problem in the PR, I'm happy to fix it, but I'd need some pointers. :\

...before the helper's cleanup method tries to delete their files.
@ben
Copy link
Member

ben commented Sep 30, 2013

👆 Proposed fix to the win32 errors. Basically, the cleanup method being injected by using setup_fixture_submodules was running before test_stash_submodules__cleanup could close down the submodule repo it had opened.

This patch makes the test code a bit noisier, but ensures that those resources are freed before the files are deleted. @jspahrsummers, what do you think?

@jspahrsummers
Copy link
Contributor Author

@ben Thanks!

👍 from me.

@vmg
Copy link
Member

vmg commented Sep 30, 2013

Looks perfect. Thanks for looking into this @ben!

vmg pushed a commit that referenced this pull request Sep 30, 2013
Never consider submodules for stashing
@vmg vmg merged commit 9acde16 into development Sep 30, 2013
phatblat pushed a commit to phatblat/objective-git that referenced this pull request Sep 13, 2014
phatblat pushed a commit to phatblat/libgit2 that referenced this pull request Sep 13, 2014
@nulltoken nulltoken deleted the ignore-submodules-in-stash branch November 8, 2014 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants