Only use --empty=keep option with git versions that support it #2585
Conversation
This file contains hidden or 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
stefanhaller
commented
May 2, 2023
| @@ -9,7 +9,7 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{ | |||
| Description: "Drops a commit during interactive rebase when there is an update-ref in the git-rebase-todo file", | |||
| ExtraCmdArgs: "", | |||
| Skip: false, | |||
| GitVersion: From("2.38.0"), | |||
| GitVersion: AtLeast("2.38.0"), | |||
There was a problem hiding this comment.
@jesseduffield I know I convinced you to go with Before/From, but after seeing it at the usage sites I now think that AtLeast reads more naturally. I would still keep Before for the other one though.
|
Uffizzi Preview |
stefanhaller
force-pushed
the
only-use-empty-arg-when-available
branch
from
89d7331 to
d607b36
Compare
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.
Avoid errors when doing interactive rebases with git versions older than 2.26.
go run scripts/cheatsheet/main.go generate)docs/Config.md) have been updated if necessary