From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-997954-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 20F87138206
	for <garchives@archives.gentoo.org>; Tue, 16 Jan 2018 16:24:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 8AE7CE08D0;
	Tue, 16 Jan 2018 16:24:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 6C29EE08D0
	for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2018 16:24:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A2150335C5B
	for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2018 16:24:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 35505151
	for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jan 2018 16:24:49 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1516119883.c63938c5e093ed690ef1a96ea463396a3ac90ada.vapier@gentoo>
Subject: [gentoo-commits] proj/releng:master commit in: tools/
X-VCS-Repository: proj/releng
X-VCS-Files: tools/catalyst-auto
X-VCS-Directories: tools/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: c63938c5e093ed690ef1a96ea463396a3ac90ada
X-VCS-Branch: master
Date: Tue, 16 Jan 2018 16:24:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 1c62306c-ad36-46ae-8224-e90efc2f40bc
X-Archives-Hash: 8929182cddb2da684b4d37a40e1b991a

commit:     c63938c5e093ed690ef1a96ea463396a3ac90ada
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 16:24:43 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 16:24:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=c63938c5

catalyst-auto: run git merge in quiet mode

 tools/catalyst-auto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index b7036937..6aac1cc4 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -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" "$@"