From 07a1f5a72313438509bbf67045a003e51163bb21 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Thu, 15 Dec 2022 12:29:39 -0700 Subject: [PATCH] Update diff-sha.sh --- diff-sha.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/diff-sha.sh b/diff-sha.sh index 8d9ac33d..82e5d5df 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -249,7 +249,11 @@ else if git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA$DIFF$CURRENT_SHA" 1>/dev/null 2>&1; then break else - PREVIOUS_SHA=$(git merge-base --fork-point "$PREVIOUS_SHA" "$CURRENT_SHA" 2>&1) && exit_status=$? || exit_status=$? + NEW_PREVIOUS_SHA=$(git merge-base --fork-point "$PREVIOUS_SHA" "$CURRENT_SHA" 2>&1) && exit_status=$? || exit_status=$? + + if [[ -n "$NEW_PREVIOUS_SHA" ]]; then + PREVIOUS_SHA=$NEW_PREVIOUS_SHA + fi fi echo "Fetching $i commits..."