From 875e112a8fe6e368789fe44c9da9fc2e35dff183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 6 Feb 2021 11:26:07 +0100 Subject: [PATCH] fix git commit arguments --- ci/update-nur-search.sh | 2 +- ci/update-nur.sh | 2 +- nur/combine.py | 10 +--------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ci/update-nur-search.sh b/ci/update-nur-search.sh index 3334463f7..75eba0e29 100755 --- a/ci/update-nur-search.sh +++ b/ci/update-nur-search.sh @@ -26,7 +26,7 @@ nix run '(import ./release.nix {})' -c nur index nur-combined > nur-search/data/ cd nur-search if [[ ! -z "$(git diff --exit-code)" ]]; then git add ./data/packages.json - git commit "Nur a bot " -m "automatic update package.json" + git commit -m "automatic update package.json" git pull --rebase origin master git push origin master nix-shell --run "make clean && make && make publish" diff --git a/ci/update-nur.sh b/ci/update-nur.sh index cf582a773..dda8af0a7 100755 --- a/ci/update-nur.sh +++ b/ci/update-nur.sh @@ -24,7 +24,7 @@ if [[ -z "$(git diff --exit-code)" ]]; then echo "No changes to the output on this push; exiting." else git add --all repos.json* - git commit "Nur a bot " -m "automatic update" + git commit -m "automatic update" # in case we are getting overtaken by a different job git pull --rebase origin master git push "https://$API_TOKEN_GITHUB@github.com/nix-community/NUR" HEAD:master diff --git a/nur/combine.py b/nur/combine.py index 9a38fdae3..365429ea9 100644 --- a/nur/combine.py +++ b/nur/combine.py @@ -42,15 +42,7 @@ def commit_files(files: List[str], message: str) -> None: cmd.extend(files) subprocess.check_call(cmd) if repo_changed(): - subprocess.check_call( - [ - "git", - "commit", - "Nur a bot ", - "-m", - message, - ] - ) + subprocess.check_call(["git", "commit", "-m", message]) def commit_repo(repo: Repo, message: str, path: Path) -> Repo: