From a5f56eaec6fb722bff9a235070b233686337b269 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 20 Feb 2010 15:08:06 +0100 Subject: ct: vcs_pull: Only use git pull --quiet if SILENT=1. Dammit. --- bin/ct | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bin/ct') diff --git a/bin/ct b/bin/ct index 6177363..8790f7a 100755 --- a/bin/ct +++ b/bin/ct @@ -100,6 +100,12 @@ if (( $#PKG_ROOTS == 0 )) { export PKG_DIR export PKG_ROOT +if (( SILENT )) { + GIT_SILENT_ARG=--quiet +} else { + GIT_SILENT_ARG= +} + self=$0 self_path=$PKG_DIR/${${(s:/:)$(readlink $self)}[-3]} @@ -266,7 +272,7 @@ function vcs_log ( function vcs_pull ( vcs_setup $1 if (( GIT_USE_ORIGIN )) { - git pull ${SILENT:+--quiet} + git pull $GIT_SILENT_ARG } else { pkgroot_parse $(list_get_root $1) vcs_branch_is_master $1 && git pull $PKG_ROOT/${PWD:t} master -- cgit v1.2.3