chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

catalyst-auto: run git merge in quiet mode

Browse source
This commit is contained in:
Mike Frysinger 2018-01-16 11:24:43 -05:00
parent 40ed3e84d7
commit c63938c5e0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/catalyst-auto
View file

@ -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" "$@"