From 55362b9d1bd8f58f528fd689d8da6f11fb468f91 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Wed, 15 Feb 2023 20:36:23 -0700 Subject: [PATCH] Fixed the test --- get-changed-paths.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/get-changed-paths.sh b/get-changed-paths.sh index ca7566a2..a7da095f 100755 --- a/get-changed-paths.sh +++ b/get-changed-paths.sh @@ -83,10 +83,7 @@ function get_diff() { if [ -n "$sub_commit_cur" ]; then ( - cd "$sub" && ( - # the strange magic number is a hardcoded "empty tree" commit sha - git diff --diff-filter="$filter" --name-only --ignore-submodules=all "${sub_commit_pre:-4b825dc642cb6eb9a060e54bf8d69288fbee4904}" "${sub_commit_cur}" | awk -v r="$sub" '{ print "" r "/" $0}' 2>/dev/null - ) + cd "$sub" && git diff --diff-filter="$filter" --name-only --ignore-submodules=all "${sub_commit_pre:-4b825dc642cb6eb9a060e54bf8d69288fbee4904}" "${sub_commit_cur}" | awk -v r="$sub" '{ print "" r "/" $0}' 2>/dev/null ) || { echo "::warning::Failed to get changed files for submodule ($sub) between: ${sub_commit_pre:-4b825dc642cb6eb9a060e54bf8d69288fbee4904} ${sub_commit_cur}. Please ensure that submodules are initialized and up to date. See: https://github.com/actions/checkout#usage" >&2 } @@ -118,10 +115,7 @@ function get_renames() { if [ -n "$sub_commit_cur" ]; then ( - cd "$sub" && ( - # the strange magic number is a hardcoded "empty tree" commit sha - git log --name-status --ignore-submodules=all "${sub_commit_pre:-4b825dc642cb6eb9a060e54bf8d69288fbee4904}" "${sub_commit_cur}" | { grep -E "^R" || true; } | awk -F '\t' -v d="$INPUT_OLD_NEW_SEPARATOR" '{print $2d$3}' | awk -v r="$sub" '{ print "" r "/" $0}' - ) + cd "$sub" && git log --name-status --ignore-submodules=all "${sub_commit_pre:-4b825dc642cb6eb9a060e54bf8d69288fbee4904}" "${sub_commit_cur}" | { grep -E "^R" || true; } | awk -F '\t' -v d="$INPUT_OLD_NEW_SEPARATOR" '{print $2d$3}' | awk -v r="$sub" '{ print "" r "/" $0}' ) || { echo "::warning::Failed to get renamed files for submodule ($sub) between: ${sub_commit_pre:-4b825dc642cb6eb9a060e54bf8d69288fbee4904} ${sub_commit_cur}. Please ensure that submodules are initialized and up to date. See: https://github.com/actions/checkout#usage" >&2 }