Include both commit messages in squash #16
Merged
Conversation
This file contains 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
Squash With Parent populates the commit message with the squashed commit's message and its parent's commit message. This is similar to the way 'git rebase --interactive' works. Resolves: http://forums.gitup.co/t/squash-with-parent-should-include-both-commit-messages/315
| @@ -225,7 +225,9 @@ - (void)swapCommitWithChild:(GCHistoryCommit*)commit { | |||
|
|
|||
| - (void)squashCommitWithParent:(GCHistoryCommit*)commit { | |||
| if ([self checkCleanRepositoryForOperationOnCommit:commit]) { | |||
| [self _promptForCommitMessage:_CleanedUpCommitMessage(commit.message) | |||
| GCHistoryCommit* parentCommit = commit.parents.firstObject; | |||
There was a problem hiding this comment.
What happens if the commit has no parent?
There was a problem hiding this comment.
In the GitUp UI, the "Squash With Parent" action is disabled when a commit does not have a parent. Outside of GitUp usage this of course result in an error but I believe there are other places that assume commit.parents will be non-null.
swisspol
added a commit
that referenced
this pull request
Sep 27, 2015
Include both commit messages in squash
|
All good then, thx! |
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.
Squash With Parent populates the commit message with the squashed
commit's message and its parent's commit message. This is similar to
the way 'git rebase --interactive' works.
Resolves: http://forums.gitup.co/t/squash-with-parent-should-include-both-commit-messages/315