Safely handle pulling squashed PRs #28
Labels
enhancement
Improve the expected
Comments
epage
added a commit
that referenced
this issue
Oct 8, 2021
Before, when doing a `git-stack --pull`, we'd rebase the merged branch onto master. `git` would the automatically detect the commit is merged and drop it. We'd then associate the branch name with the same commit master points to and have to delete it manually. This tries to detect that case so we can automatically delete the stale branch on behalf of users. This does not help if your branch is behind master because those extra commits will impact how we are detecting this case (tree id). This is a spiritual revert of 80f5158, re-implementing 892117b to handle all of our changes and with a little more experience and context. This is a part of #28.
epage
added a commit
that referenced
this issue
Oct 8, 2021
Before, when doing a `git-stack --pull`, we'd rebase the merged branch onto master. `git` would the automatically detect the commit is merged and drop it. We'd then associate the branch name with the same commit master points to and have to delete it manually. This tries to detect that case so we can automatically delete the stale branch on behalf of users. This does not help if your branch is behind master because those extra commits will impact how we are detecting this case (tree id). This is a spiritual revert of 80f5158, re-implementing 892117b to handle all of our changes and with a little more experience and context. This is a part of #28.
epage
added a commit
that referenced
this issue
Oct 8, 2021
Before, when doing a `git-stack --pull`, we'd rebase the merged branch onto master. `git` would the automatically detect the commit is merged and drop it. We'd then associate the branch name with the same commit master points to and have to delete it manually. This tries to detect that case so we can automatically delete the stale branch on behalf of users. This does not help if your branch is behind master because those extra commits will impact how we are detecting this case (tree id). This is a spiritual revert of 80f5158, re-implementing 892117b to handle all of our changes and with a little more experience and context. This is a part of #28.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Version
0.1.0
Use Case
git stack --pullRequirements
Possible Solutions
https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/git-rebase-update.html
#4 is about a way to unsafely handle pulling squashed PRs
The text was updated successfully, but these errors were encountered: