Skip to content

Rebase: Run post-checkout hook on checkout #1992

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 2 commits into from
Dec 21, 2018

Conversation

orgads
Copy link

@orgads orgads commented Dec 20, 2018

This PR fixes a regression introduced by switching to the built-in rebase: the post-checkout hook was run in the scripted version but not in the built-in version.

@orgads orgads force-pushed the rebase-post-checkout-hook branch from c34ad5a to b532ab4 Compare December 20, 2018 08:46
@orgads
Copy link
Author

orgads commented Dec 20, 2018

I can't currently post the patch to the mailing list, and I doubt this is the right way to deal with the GIT_DIR bug (assuming it's a bug at all). Let's start the review here, and if you accept it, I'll post it upstream.

Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The second commit looks like a fixup for the first one, so I'd rather have a single commit. Besides, I think you can avoid a lot of churn by using the -C <cd-to> option a lot more, and by using read a b c <file instead of multiple awk invocations.

* Replace multiple clones and commits by test_commits.
* Replace 3 invocations of awk by read.

Signed-off-by: Orgad Shaneh <[email protected]>
@orgads orgads force-pushed the rebase-post-checkout-hook branch from b532ab4 to 93f5484 Compare December 20, 2018 21:59
@dscho
Copy link
Member

dscho commented Dec 21, 2018

Very, very nice!

@dscho dscho merged commit 7b95654 into git-for-windows:master Dec 21, 2018
@dscho dscho added this to the v2.20.1(2) milestone Dec 21, 2018
dscho added a commit to dscho/git that referenced this pull request Feb 7, 2019
…out-hook

Rebase: Run post-checkout hook on checkout
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.

2 participants