Skip to content
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.

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

Only use --empty=keep option with git versions that support it #2585

Conversation

stefanhaller
Copy link
Collaborator

  • PR Description

Avoid errors when doing interactive rebases with git versions older than 2.26.

  • Please check if the PR fulfills these requirements
  • Cheatsheets are up-to-date (run go run scripts/cheatsheet/main.go generate)
  • Code has been formatted (see here)
  • Tests have been added/updated (see here for the integration test guide)
  • Text is internationalised (see here)
  • Docs (specifically docs/Config.md) have been updated if necessary
  • You've read through your own file changes for silly mistakes etc

@@ -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"),
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@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.

@github-actions
Copy link
Contributor

github-actions bot commented May 2, 2023

Uffizzi Preview deployment-24060 was deleted.

@stefanhaller stefanhaller force-pushed the only-use-empty-arg-when-available branch from 89d7331 to d607b36 Compare May 2, 2023 14:29
@jesseduffield jesseduffield merged commit 5149b24 into jesseduffield:master May 3, 2023
9 checks passed
@stefanhaller stefanhaller deleted the only-use-empty-arg-when-available branch May 4, 2023 06:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants