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.

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

githooks: just update submodule on ref changes #12088

Merged
merged 1 commit into from
Dec 6, 2016
Merged

Conversation

dt
Copy link
Member

@dt dt commented Dec 6, 2016

with deps now managed by the scm directly (the vendor submodule), we don't need to run glock or make during scm operations


This change is Reviewable

with deps now managed by the scm directly (the vendor submodule), we don't need to run glock or make during scm operations
@dt dt assigned tamird Dec 6, 2016
@tamird
Copy link
Contributor

tamird commented Dec 6, 2016

:lgtm:


Reviewed 3 of 3 files at r1.
Review status: all files reviewed at latest revision, 1 unresolved discussion, all commit checks successful.


githooks/post-rewrite, line 4 at r1 (raw file):

set -e

# TODO(dt): do we want to submomdule update here?

it's pretty cheap, why not?


Comments from Reviewable

@dt
Copy link
Member Author

dt commented Dec 6, 2016

Review status: all files reviewed at latest revision, 1 unresolved discussion, all commit checks successful.


githooks/post-rewrite, line 4 at r1 (raw file):

Previously, tamird (Tamir Duberstein) wrote…

it's pretty cheap, why not?

I'll add it if it turns out we want it, but I'm thinking we can just nuke this hook instead?


Comments from Reviewable

@tamird
Copy link
Contributor

tamird commented Dec 6, 2016 via email

@dt
Copy link
Member Author

dt commented Dec 6, 2016

The internet seems to think we just need post-merge and post-checkout, so I'll start there. If we decide we're missing post-rewrite, it's quick to add it.


Review status: all files reviewed at latest revision, 1 unresolved discussion, all commit checks successful.


Comments from Reviewable

@dt dt merged commit b4de2e6 into cockroachdb:master Dec 6, 2016
@dt dt deleted the hooks branch December 6, 2016 15:27
@bdarnell
Copy link
Contributor

bdarnell commented Dec 6, 2016

IIRC git pull --rebase runs post-rewrite but not post-merge or post-checkout. You have to resync the submodule because the branch being rebased onto might have updated it.

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.

3 participants