summaryrefslogtreecommitdiff
path: root/bin/ct
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-02-20 15:08:06 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2010-02-20 15:08:06 +0100
commita5f56eaec6fb722bff9a235070b233686337b269 (patch)
tree82f2913f988c5758cbabfbe3be3ecbd954590fbc /bin/ct
parent99075e1e7df0358a0d36a41427f333e7a3bee24d (diff)
ct: vcs_pull: Only use git pull --quiet if SILENT=1. Dammit.
Diffstat (limited to 'bin/ct')
-rwxr-xr-xbin/ct8
1 files changed, 7 insertions, 1 deletions
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