Skip to content

Add trailing commas on addFlag incantations (backport #12967) #12968

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

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 7, 2025

cc @Ericson2314, from #12957

Motivation

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #12967 done by [Mergify](https://mergify.com).

grahamc added 2 commits April 7, 2025 23:15
(cherry picked from commit 06acbd3)

# Conflicts:
#	src/libcmd/command.cc
#	src/libcmd/installables.cc
#	src/nix/copy.cc
#	src/nix/flake.cc
(cherry picked from commit 9b47b2b)

# Conflicts:
#	src/libcmd/command.cc
@mergify mergify bot requested review from Ericson2314 and edolstra as code owners April 7, 2025 23:15
Copy link
Contributor Author

mergify bot commented Apr 7, 2025

Cherry-pick of 06acbd3 has failed:

On branch mergify/bp/2.24-maintenance/pr-12967
Your branch is up to date with 'origin/2.24-maintenance'.

You are currently cherry-picking commit 06acbd37b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/libcmd/common-eval-args.cc
	modified:   src/libmain/common-args.cc
	modified:   src/libmain/shared.cc
	modified:   src/libstore/globals.cc
	modified:   src/nix/build.cc
	modified:   src/nix/bundle.cc
	modified:   src/nix/derivation-show.cc
	modified:   src/nix/develop.cc
	modified:   src/nix/env.cc
	modified:   src/nix/prefetch.cc
	modified:   src/nix/sigs.cc
	modified:   src/nix/store-delete.cc
	modified:   src/nix/store-gc.cc
	modified:   src/nix/upgrade-nix.cc
	modified:   src/nix/verify.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libcmd/command.cc
	both modified:   src/libcmd/installables.cc
	both modified:   src/nix/copy.cc
	both modified:   src/nix/flake.cc

Cherry-pick of 9b47b2b has failed:

On branch mergify/bp/2.24-maintenance/pr-12967
Your branch is ahead of 'origin/2.24-maintenance' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9b47b2b21.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libcmd/command.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Apr 7, 2025
@github-actions github-actions bot added the new-cli Relating to the "nix" command label Apr 7, 2025
@edolstra edolstra closed this Apr 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue new-cli Relating to the "nix" command
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants