Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

feat: git wf done detects squash commits #12

Merged
merged 4 commits into from
Oct 29, 2020

Conversation

dbushong
Copy link
Contributor

  • chore: upgrade simple-git
  • feat: done: detect squash commits
  • fix: work with new simple-git output
  • test: done: add test for squash merge detect

This PR was started by: git wf pr

David Bushong added 4 commits October 29, 2020 11:32
Previously, if you did a GitHub Squash Merge, since the SHAs are
rewritten, `git wf done` would not detect that you could safely delete
the branch.  Now, if it doesn't find those exact commits, it examines
the commits since the merge-base with your parent branch and sees if any
of the diffs are identical to what it would expect.
@dbushong dbushong merged commit dba1bc0 into master Oct 29, 2020
@dbushong dbushong deleted the dbushong/feature/master/squash-detect branch October 29, 2020 20:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants