Skip to content

Commit d5da5a2

Browse files
committed
git-merge-customizations: Fix a hard-coded remote configuration
1 parent a59ec6c commit d5da5a2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

git/git-merge-customizations

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@ fi
1414
echo "Resetting branch to '$UPSTREAM_BRANCH'..."
1515
git reset --hard $UPSTREAM_BRANCH
1616

17-
echo "Merging '$CUSTOMIZATION_BRANCHES' into '$CURRENT_BRANCH'..."
18-
git for-each-ref --format='%(refname)' refs/remotes/internal/ort-pipeline-customizations | xargs -n1 git merge --no-ff
17+
echo "Merging the following branches into '$CURRENT_BRANCH'..."
18+
for BRANCH in $CUSTOMIZATION_BRANCHES; do
19+
echo $BRANCH
20+
done
21+
22+
git merge --no-ff $CUSTOMIZATION_BRANCHES

0 commit comments

Comments
 (0)