Skip to content

Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge #3188

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 17 commits into from
Jan 5, 2018
Merged

Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge #3188

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4877095
Pull request options migration and UI in settings
lafriks Dec 13, 2017
cec0e5b
Add ignore whitespace functionality
lafriks Dec 13, 2017
2f290af
Fix settings if pull requests are disabled
lafriks Dec 13, 2017
9cceefc
Fix migration transaction
lafriks Dec 13, 2017
640fc93
Merge with Rebase functionality
lafriks Dec 14, 2017
8524896
UI changes and related functionality for pull request merging button
lafriks Dec 17, 2017
204f042
Implement squash functionality
lafriks Dec 17, 2017
db1cf2f
Fix rebase merging
lafriks Dec 17, 2017
d90ebd6
Fix pull request merge tests
lafriks Dec 17, 2017
ee9995b
Add squash and rebase tests
lafriks Dec 17, 2017
b0ab68a
Fix API method to reuse default message functions
lafriks Dec 18, 2017
0e99ba9
Some refactoring and small fixes
lafriks Dec 27, 2017
ea5691b
Remove more hardcoded values from tests
lafriks Dec 27, 2017
82a747c
Remove unneeded check from API method
lafriks Dec 27, 2017
552530d
Fix variable name and comment typo
lafriks Dec 28, 2017
60b2092
Fix reset commit count after PR merge
lafriks Dec 28, 2017
8abe208
Merge branch 'master' into feat/add_pr_merge_options
lafriks Jan 5, 2018
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
Prev Previous commit
Next Next commit
Implement squash functionality
  • Loading branch information
@lafriks
lafriks committed Dec 31, 2017
commit 204f0428e0c136f7f3a2d5d4c8b7a7aa33d8bbd3
14 changes: 14 additions & 0 deletions models/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,20 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
"git", "rebase", "-q", pr.BaseBranch, "head_repo/"+pr.HeadBranch); err != nil {
return fmt.Errorf("git rebase [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
}
case MergeStyleSquash:
// Merge with squash
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
"git", "merge", "-q", "--squash", "head_repo/"+pr.HeadBranch); err != nil {
return fmt.Errorf("git merge --squash [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
}
sig := pr.Issue.Poster.NewGitSig()
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath),
"git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
"-m", message); err != nil {
return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
}
default:
return ErrInvalidMergeStyle{pr.BaseRepo.ID, mergeStyle}
}
Expand Down