fix(graph): Gracefully handle squash-merges #80
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
So it looks like tree ID is the same if the file contents are exactly the same but the commit metadata is different. This is rare but useful.
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before, when doing a
git-stack --pull, we'd rebase the merged branchonto master.
gitwould the automatically detect the commit is mergedand 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.