Add support for "--rebase-merges" for newest version of git #6920
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
ghost
assigned 
gerhardol
approved these changes
Jul 13, 2019
Codecov Report
@@ Coverage Diff @@
## master #6920 +/- ##
==========================================
- Coverage 47.69% 47.64% -0.06%
==========================================
Files 736 736
Lines 54054 54056 +2
Branches 7086 7103 +17
==========================================
- Hits 25782 25754 -28
- Misses 26877 26883 +6
- Partials 1395 1419 +24
|
RussKie
reviewed
Jul 14, 2019
| @@ -605,7 +605,7 @@ public void RebaseCmd() | |||
| "-c rebase.autoSquash=false rebase -i --no-autosquash \"branch\"", | |||
| GitCommandHelpers.RebaseCmd("branch", interactive: true, preserveMerges: false, autosquash: false, autoStash: false).Arguments); | |||
| Assert.AreEqual( | |||
| "-c rebase.autoSquash=false rebase --preserve-merges \"branch\"", | |||
| "-c rebase.autoSquash=false rebase --rebase-merges \"branch\"", | |||
There was a problem hiding this comment.
Tests should pivot on git version.
So if someone runs a codebase against an older version of git (like me while testing) they shouldn't get a test failure.
There was a problem hiding this comment.
Note: We have a few tests for features not in the oldest supported version, but those tests do not use Git binaries (only argument tests).
| @@ -617,7 +617,7 @@ public void RebaseCmd() | |||
| "-c rebase.autoSquash=false rebase -i --autosquash \"branch\"", | |||
| GitCommandHelpers.RebaseCmd("branch", interactive: true, preserveMerges: false, autosquash: true, autoStash: false).Arguments); | |||
| Assert.AreEqual( | |||
| "-c rebase.autoSquash=false rebase -i --autosquash --preserve-merges --autostash \"branch\"", | |||
| "-c rebase.autoSquash=false rebase -i --autosquash --rebase-merges --autostash \"branch\"", | |||
appveyor.yml
Outdated
| @@ -1,6 +1,6 @@ | |||
| version: 3.2.0.{build} | |||
There was a problem hiding this comment.
Let's submit this change separately, as it is orthogonal to the main change
There was a problem hiding this comment.
that was a last test (before going to bed ;) ) to gather information, not planned to be merged...
pmiossec
force-pushed
the
support_rebase_merges
branch
from
47a75fa
to
2df922e
Compare
now that we recommend v2.22 (gitextensions#6769) that deprecate "--preserve-merges" See: * for option deprection: git/git@fa1b86e#diff-c7361e406139e8cd3a300b80b8f8cc8dR1220 * for some doc: https://stackoverflow.com/questions/15915430/what-exactly-does-gits-rebase-preserve-merges-do-and-why/50555740#50555740
pmiossec
force-pushed
the
support_rebase_merges
branch
from
2df922e
to
519c0dc
Compare
|
done. |
|
We could include this in 3.2 |
RussKie
approved these changes
Jul 17, 2019
|
Thank you |
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.
now that we recommend v2.22 (#6769) that deprecate "--preserve-merges"
See:
Test methodology
Test environment(s)