Fixes #13441: quality assistant may fail to detecte fixups #415
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
| @@ -1432,7 +1432,7 @@ def merge_version(old, new, strategy=None, automatic=False, test=False, run_test | |||
| # Squash commits in PR if necessary | |||
| def pre_merge_squash(version, pr_branch, pr, test=False): | |||
| pull(version) | |||
| log = shell("git log --oneline " + pr.base_branch() + ".." + pr_branch, keep_output=True) | |||
There was a problem hiding this comment.
If you just keep %s, you can simplify the if below (we do not need the hash )
peckpeck
force-pushed
the
bug_13441/quality_assistant_may_fail_to_detecte_fixups
branch
from
701ad17
to
9a1e59a
Compare
|
Commit modified |
VinceMacBuche
approved these changes
Sep 13, 2018
|
OK, merging this PR |
peckpeck
deleted the
bug_13441/quality_assistant_may_fail_to_detecte_fixups
branch
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.
https://www.rudder-project.org/redmine/issues/13441