From fa93f086be44b01568b8a6ae7026a9906a49e279 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 4 Jul 2025 16:03:44 +0900 Subject: [PATCH] Remove old debug commands --- src/bin/git_sync.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/bin/git_sync.sh b/src/bin/git_sync.sh index cf1eac5..00d658b 100755 --- a/src/bin/git_sync.sh +++ b/src/bin/git_sync.sh @@ -24,21 +24,18 @@ fi; LOG_FILE="${GIT_WEBHOOK_BASE_FOLDER}${LOG_FOLDER}${REPOSITORY}.log"; unique_id=$(uuidgen | tr -d '-' | head -c 8); -# fetch to null -# ${GIT_COMMAND} -C "${REPOSITORY_PATH}" fetch -q "${REMOTE}" "${BRANCH}"; +# fetch to for diff check GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" "fetch" "-q" "${REMOTE_NAME}" "${BRANCH}") "${GIT_COMMAND[@]}" -# check diff +# check diff for if we need to update 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[@]}" 2>&1) if [ -n "${changes}" ]; then - echo "[$(date +"%Y-%m-%d %H:%M:%S")] [${unique_id}] [START] Changes ===>" &>> "$LOG_FILE"; - # ${GIT_COMMAND_BASE} -C "/${REPOSITORY_PATH}" merge "${REMOTE}"/"${BRANCH}" + echo "[$(date +"%Y-%m-%d %H:%M:%S")] [${unique_id}] [START] Changes" &>> "$LOG_FILE"; GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" merge "${REMOTE_NAME}/${BRANCH}") log_data=$("${GIT_COMMAND[@]}" 2>&1); echo "[$(date +"%Y-%m-%d %H:%M:%S")] [${unique_id}] ${log_data}" &>> "$LOG_FILE"; - echo "[$(date +"%Y-%m-%d %H:%M:%S")] [${unique_id}] [END] ===>" &>> "$LOG_FILE"; + echo "[$(date +"%Y-%m-%d %H:%M:%S")] [${unique_id}] [END]" &>> "$LOG_FILE"; fi; # __END__