Skip to content

Include both commit messages in squash #16

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 27, 2015
Merged

Include both commit messages in squash #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion GitUpKit/Views/GIMapViewController+Operations.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if the commit has no parent?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

NSString* mergedMessage = [NSString stringWithFormat:NSLocalizedString(@"%@\n\n%@", nil), _CleanedUpCommitMessage(parentCommit.message), _CleanedUpCommitMessage(commit.message)];
[self _promptForCommitMessage:mergedMessage
withTitle:NSLocalizedString(@"Squashed commit message:", nil)
button:NSLocalizedString(@"Squash", nil)
block:^(NSString* message) {
Expand Down