From 98162580fa9abd88e0563927a583f236929191de Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Thu, 30 Apr 2015 13:07:45 -0700 Subject: [PATCH] update.sh: allow fetch.prune=false to suppress --prune Signed-off-by: Kyle J. McKay --- jobd/update.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jobd/update.sh b/jobd/update.sh index ed95024..7e1a346 100755 --- a/jobd/update.sh +++ b/jobd/update.sh @@ -238,7 +238,9 @@ case "$url" in ;; *) [ "$url" = "$(git config --get remote.origin.url || :)" ] || bang config_set_raw remote.origin.url "$url" - GIT_SSL_NO_VERIFY=1 bang git remote update --prune + pruneopt=--prune + [ "$(git config --bool fetch.prune 2>/dev/null || :)" != "false" ] || pruneopt= + GIT_SSL_NO_VERIFY=1 bang git remote update $pruneopt ;; esac -- 2.11.4.GIT