From 37ca4aa82427d86df3df243d8ab4458b21505a2a Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 4 Jul 2025 14:48:26 +0900 Subject: [PATCH] git changes check fix for rewrite to variable --- src/bin/git_pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/git_pull.sh b/src/bin/git_pull.sh index 411ceb2..4243377 100755 --- a/src/bin/git_pull.sh +++ b/src/bin/git_pull.sh @@ -30,7 +30,7 @@ GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" "fetch" "- # check diff GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" "diff" "--stat" "HEAD" "${REMOTE_NAME}/${BRANCH}") # changes=$(${GIT_COMMAND_BASE} -C "${REPOSITORY_PATH}" diff --stat HEAD "${REMOTE}"/"${BRANCH}"); -changes=$("${GIT_COMMAND[@]}") +changes=$("${GIT_COMMAND[@]}" 2>&1) if [ -n "${changes}" ]; then echo "[$(date +"%Y-%m-%d %H:%M:%S")] Changes" &>> "$LOG_FILE"; # ${GIT_COMMAND_BASE} -C "/${REPOSITORY_PATH}" merge "${REMOTE}"/"${BRANCH}"