summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Thiessen <alex.thiessen.de+coreboot@gmail.com>2018-01-02 00:58:28 +0000
committerNico Huber <nico.h@gmx.de>2018-01-04 14:07:20 +0000
commita71c66a52e9ec53fed4c795c7f7409c7074363d6 (patch)
tree7290596a35ef0b5dba60ac6587b6c4d478ac63b3
parentceb7788c8043021a66fd9e0fe55dfe226f742f70 (diff)
util/gitconfig: Do not wait for user input
When running `make gitconfig` on a freshly cloned repository, the script will wait for user input without a prompt in a call to `sed`, caused by a spurious newline introduced in commit 9ab8ae6a (util/gitconfig: Make gitconfig a bash script). Change-Id: I2aa722c052d24dcffa9688df09bcf8dc767bd0b6 Signed-off-by: Alex Thiessen <alex.thiessen.de+coreboot@gmail.com> Reviewed-on: https://review.coreboot.org/23059 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rwxr-xr-xutil/gitconfig/gitconfig.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/gitconfig/gitconfig.sh b/util/gitconfig/gitconfig.sh
index 116e7fb809..5f91a697da 100755
--- a/util/gitconfig/gitconfig.sh
+++ b/util/gitconfig/gitconfig.sh
@@ -16,7 +16,7 @@ for hooks in .git/modules/{3rdparty/blobs,libhwbase,libgfxinit}/hooks; do
if [ -d $hooks ]; then
if [ util/gitconfig/commit-msg -nt $hooks/commit-msg ] || \
[ ! -x $hooks/commit-msg ]; then
- sed -e "s,%MAKE%,remake,g"
+ sed -e "s,%MAKE%,remake,g" \
util/gitconfig/commit-msg > $hooks/commit-msg
chmod +x $hooks/commit-msg
fi