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

Post-rebase git hook not triggered #602

Closed
Tracked by #603
tschaffter opened this issue Aug 22, 2022 · 2 comments
Closed
Tracked by #603

Post-rebase git hook not triggered #602

tschaffter opened this issue Aug 22, 2022 · 2 comments
Assignees
Labels
bug Something isn't working dev/workflow

Comments

@tschaffter
Copy link
Member

vscode@ade7130aff68:/workspaces/challenge-registry$ git fetch upstream
remote: Enumerating objects: 1, done.
remote: Counting objects: 100% (1/1), done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (1/1), 572 bytes | 572.00 KiB/s, done.
From https://github.com/Sage-Bionetworks/challenge-registry
   4a9a0f3..80fe0ca  main       -> upstream/main

vscode@ade7130aff68:/workspaces/challenge-registry$ git rebase upstream/main
Successfully rebased and updated refs/heads/main.
@tschaffter
Copy link
Member Author

Added to Sprint 22.10. Get a final answer regarding the behavior of post-rebase hooks.

@tschaffter tschaffter self-assigned this Oct 3, 2022
@tschaffter
Copy link
Member Author

  • Rebasing currently does trigger yarn install --immutable.
  • The git hook post-checkout is called when rebasing.
  • The git hook post-rewrite is not called in my "simple" example.

The reason post-rewrite is not called may be because my rebase are fast-forward merge that do not involve rewrites. See this comment:

You are not rewriting any commits; you are fast-forwarding; so basically your branch just points to another commit. None of the commits are rewritten.

I was able to trigger the post-rewrite hook after resolving a rebase that had a conflict.

Conclusion

I need to keep the post-rewrite hook in case a conflict arise in one of the files that define package version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working dev/workflow
Projects
None yet
Development

No branches or pull requests

1 participant