RISC-V: fix git merge (#116)

opencv · Oct 16, 2023 · d0f18fc · d0f18fc
1 parent 5348b13
commit d0f18fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/OCV-Contrib-PR-4.x-RISCV.yaml b/.github/workflows/OCV-Contrib-PR-4.x-RISCV.yaml
@@ -79,6 +79,7 @@ jobs:
       run: |
         git -C ${{ env.OPENCV_CONTRIB_DOCKER_WORKDIR }} \
           pull \
+          --no-rebase --no-ff --no-commit \
           -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" \
           "${{ env.SOURCE_BRANCH_NAME }}"
     - name: Clone opencv
@@ -98,7 +99,7 @@ jobs:
         if [[ ! -z "$OPENCV_FORK" ]]; then
           echo "Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch"
           cd $HOME/opencv
-          git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}"
+          git pull --no-rebase --no-ff --no-commit -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}"
         else
           echo "No merge since ${{ env.PR_AUTHOR }}/opencv does not have branch ${{ env.SOURCE_BRANCH_NAME }}"
         fi

diff --git a/.github/workflows/OCV-PR-4.x-RISCV.yaml b/.github/workflows/OCV-PR-4.x-RISCV.yaml
@@ -79,6 +79,7 @@ jobs:
       run: |
         git -C ${{ env.OPENCV_DOCKER_WORKDIR }} \
           pull \
+          --no-rebase --no-ff --no-commit \
           -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" \
           "${{ env.SOURCE_BRANCH_NAME }}"
     - name: Clone opencv_extra
@@ -98,7 +99,7 @@ jobs:
         if [[ ! -z "$OPENCV_EXTRA_FORK" ]]; then
           echo "Merge opencv_extra with ${{ env.SOURCE_BRANCH_NAME }} branch"
           cd $HOME/opencv_extra
-          git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}"
+          git pull --no-rebase --no-ff --no-commit -v "https://github.com/${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}"
         else
           echo "No merge since ${{ env.PR_AUTHOR }}/opencv_extra does not have branch ${{ env.SOURCE_BRANCH_NAME }}"
         fi
@@ -188,6 +189,7 @@ jobs:
       run: |
         git -C ${{ env.OPENCV_DOCKER_WORKDIR }} \
           pull \
+          --no-rebase --no-ff --no-commit \
           -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" \
           "${{ env.SOURCE_BRANCH_NAME }}"
     - name: Clone opencv_contrib
@@ -207,7 +209,7 @@ jobs:
         if [[ ! -z "$OPENCV_CONTRIB_FORK" ]]; then
           echo "Merge opencv_contrib with ${{ env.SOURCE_BRANCH_NAME }} branch"
           cd $HOME/opencv_contrib
-          git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv_contrib" "${{ env.SOURCE_BRANCH_NAME }}"
+          git pull --no-rebase --no-ff --no-commit -v "https://github.com/${{ env.PR_AUTHOR }}/opencv_contrib" "${{ env.SOURCE_BRANCH_NAME }}"
         else
           echo "No merge since ${{ env.PR_AUTHOR }}/opencv_contrib does not have branch ${{ env.SOURCE_BRANCH_NAME }}"
         fi