Skip to content

Commit

Permalink
change the check for deleted files
Browse files Browse the repository at this point in the history
  • Loading branch information
jazzsequence committed Aug 2, 2024
1 parent be56762 commit 7258398
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion devops/scripts/deploy-public-upstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ for commit in "${commits[@]}"; do
echo "Conflict detected in $commit. Checking for deleted files."
conflicted_files=$(git diff --name-only --diff-filter=U)
for file in $conflicted_files; do
if git show "$commit" -- "$file" | grep -q 'delete mode'; then
if git diff "$commit"^.."$commit" -- "$file" | grep -q 'delete mode'; then
echo "File $file was deleted in the cherry-picked commit. Resolving by keeping the deletion."
git rm "$file"
else
Expand Down

0 comments on commit 7258398

Please sign in to comment.