From 90735661fe0b8758105bae0a0e91fb224540415a Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 13 Jan 2017 01:18:54 -0500 Subject: [PATCH 1/2] Set git user info for Homebrew committing The `git commit` command wants to set both an author and a committer. The `--author` flag only sets the author, leaving git without a value for the committer, causing git to attempt to autodiscover that value. To work around it, use the `-c` git flag to temporarily set the relevant config variables for the scope of the command. --- etc/ci/upload_nightly.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/ci/upload_nightly.sh b/etc/ci/upload_nightly.sh index 474bead8abb..8cd3547f7c2 100755 --- a/etc/ci/upload_nightly.sh +++ b/etc/ci/upload_nightly.sh @@ -52,8 +52,10 @@ update_brew() { > "${tmp_dir}/Formula/servo-bin.rb" git -C "${tmp_dir}" add ./Formula/servo-bin.rb - git -C "${tmp_dir}" commit \ - --author="Tom Servo " \ + git -C "${tmp_dir}" \ + -c user.name="Tom Servo" \ + -c user.email="servo@servo.org" \ + commit \ --message="Version bump: ${version}" git -C "${tmp_dir}" push -qf \ From 78a2e6a93091e48750d117f6b8a52c2d78411f97 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 13 Jan 2017 01:20:53 -0500 Subject: [PATCH 2/2] Avoid using variables in printf format string --- etc/ci/upload_nightly.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/ci/upload_nightly.sh b/etc/ci/upload_nightly.sh index 8cd3547f7c2..8a8128fb9f5 100755 --- a/etc/ci/upload_nightly.sh +++ b/etc/ci/upload_nightly.sh @@ -11,7 +11,9 @@ shopt -s failglob usage() { - printf "usage: ${0} android|linux|mac|macbrew|windows-gnu|windows-msvc\n" + printf \ + "usage: %s android|linux|mac|macbrew|windows-gnu|windows-msvc\n" \ + "${0}" }