PR #23683 opened by Kacper Michajłow (kasper93) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23683 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23683.patch
From 0685a58a752d88c915f556486228106a8ecd69ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]> Date: Fri, 3 Jul 2026 00:05:20 +0200 Subject: [PATCH] rebase pr debug --- .forgejo/actions/rebase-pr/action.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.forgejo/actions/rebase-pr/action.yml b/.forgejo/actions/rebase-pr/action.yml index fa8c9e2a09..f17c2f4b40 100644 --- a/.forgejo/actions/rebase-pr/action.yml +++ b/.forgejo/actions/rebase-pr/action.yml @@ -13,11 +13,12 @@ runs: if: ${{ forge.event_name == 'pull_request' }} working-directory: ${{ inputs.path }} run: | + set -x # Fetch all PR commits + merge-base commits=$(curl -s -o /dev/null -w '%header{X-Total-Count}' '${{ forge.api_url }}/repos/${{ forge.repository }}/pulls/${{ forge.event.pull_request.number }}/commits?limit=1&verification=false&files=false') - git fetch --deepen=$commits origin pull/${{ forge.event.pull_request.number }}/head + git fetch -vv --deepen=$commits origin pull/${{ forge.event.pull_request.number }}/head # Fetch target branch - git fetch --depth=1 origin ${{ forge.base_ref }} + git fetch -vv --depth=1 origin ${{ forge.base_ref }} # Rebase PR commits onto the current state of target branch - git rebase --onto origin/${{ forge.base_ref }} ${{ forge.event.pull_request.merge_base }} \ + git rebase -vv --onto origin/${{ forge.base_ref }} ${{ forge.event.pull_request.merge_base }} \ || { echo "::error::does not rebase cleanly onto ${{ forge.base_ref }}"; exit 1; } -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
