diff --git a/update_child_repos.sh b/update_child_repos.sh index a75face..21fc2f7 100755 --- a/update_child_repos.sh +++ b/update_child_repos.sh @@ -21,7 +21,7 @@ if [ "${PREVIOUS_COMMIT_ID}" = "${CURRENT_COMMIT_ID}" ]; then FILES_PERMISSION_CHANGED="" else FILES_CHANGED=$(git diff --name-only "${PREVIOUS_COMMIT_ID}" "${CURRENT_COMMIT_ID}" | tr '\n' ' ') - FILES_PERMISSION_CHANGED=$(git diff --summary "${PREVIOUS_COMMIT_ID}" "${CURRENT_COMMIT_ID}" | grep "mode change" | sed -E 's/.*mode change [0-9]+ => [0-9]+ (.*)/\1/' | tr '\n' ' ') + FILES_PERMISSION_CHANGED=$(git diff --summary "${PREVIOUS_COMMIT_ID}" "${CURRENT_COMMIT_ID}" | (grep "mode change" || true) | sed -E 's/.*mode change [0-9]+ => [0-9]+ (.*)/\1/' | tr '\n' ' ') fi is_file_changed() { @@ -82,13 +82,13 @@ while IFS= read -r clone_url; do repo_name=$(basename "${clone_url}" .git) - git clone "${clone_url}" "${repo_name}" - pushd "${repo_name}" + git clone "${clone_url}" "${repo_name}" &>/dev/null + pushd "${repo_name}" >/dev/null TEMPLATE_REMOTE_NAME="template" git remote add "${TEMPLATE_REMOTE_NAME}" "${TEMPLATE_REPO_DIR}" - git fetch "${TEMPLATE_REMOTE_NAME}" "${TEMPLATE_BRANCH}" + git fetch "${TEMPLATE_REMOTE_NAME}" "${TEMPLATE_BRANCH}" &>/dev/null current_branch=$(git rev-parse --abbrev-ref HEAD) @@ -177,13 +177,13 @@ while IFS= read -r clone_url; do git push else echo "Warning: Merge conflicts detected in ${repo_name}" - popd + popd >/dev/null rm -rf "${repo_name}" continue fi fi - popd + popd >/dev/null rm -rf "${repo_name}" done <<< "${CLONE_URLS}"