catalyst-auto: run git merge in quiet mode
This commit is contained in:
parent
40ed3e84d7
commit
c63938c5e0
|
@ -203,7 +203,7 @@ git_update() {
|
|||
repo_dir=$1 script=$2
|
||||
shift 2
|
||||
pushd "${repo_dir}" >/dev/null
|
||||
git merge FETCH_HEAD || echo "${script}: WARNING: git repo is dirty"
|
||||
git merge -q FETCH_HEAD || echo "${script}: WARNING: git repo is dirty"
|
||||
popd >/dev/null
|
||||
exec "${script}" "$@"
|
||||
' -- "${REPO_DIR}" "$0" "$@"
|
||||
|
|
Loading…
Reference in a new issue