From 87c66f923eab2d6035054ea498e8cf4b1ddf78ce Mon Sep 17 00:00:00 2001 From: Mika Ayenson Date: Thu, 9 Mar 2023 17:31:19 -0500 Subject: [PATCH] Update commit-and-push.sh (#2640) --- detection_rules/etc/commit-and-push.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/detection_rules/etc/commit-and-push.sh b/detection_rules/etc/commit-and-push.sh index fb5180692..27ce5f4c6 100755 --- a/detection_rules/etc/commit-and-push.sh +++ b/detection_rules/etc/commit-and-push.sh @@ -7,21 +7,9 @@ TARGET_BRANCH=$1 COMMIT_SHA=$2 echo "Backporting from commit ${COMMIT_SHA} on branch ${TARGET_BRANCH}" -echo "Stashing changes" -git stash - echo "Checking out target branch" git checkout ${TARGET_BRANCH} -echo "Applying new changes" -(git stash apply --quiet) || true - -echo "Selecting incoming changes to be committed" -git checkout --theirs . --quiet - -echo "Track new changes" -git add -A - NEEDS_BACKPORT=$(git diff HEAD --quiet --exit-code && echo n || echo y) if [ "n" = "$NEEDS_BACKPORT" ]