From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 2/2] tools/merge-all-source-plugins: Check that there are no uncommited changes
Date: Thu, 15 May 2025 15:04:13 +0200
Message-ID: <20250515130413.2279965-2-michael@niedermayer.cc> (raw)
In-Reply-To: <20250515130413.2279965-1-michael@niedermayer.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
tools/merge-all-source-plugins | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
index 05f4fe5e97b..231d9ddcb64 100755
--- a/tools/merge-all-source-plugins
+++ b/tools/merge-all-source-plugins
@@ -5,6 +5,17 @@ merge(){ # $1=repository, $2=refspec
git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2
}
+error(){
+ echo $1
+ exit 1
+}
+
+git diff --exit-code >/dev/null ||\
+ error "Please commit local chanegs first"
+
+git diff --cached --exit-code >/dev/null ||\
+ error "Please commit local chanegs first"
+
version="master"
merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"
--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2025-05-15 13:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-15 13:04 [FFmpeg-devel] [PATCH 1/2] tools/merge-all-source-plugins: Try merging a tag or branch matching the current version first Michael Niedermayer
2025-05-15 13:04 ` Michael Niedermayer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250515130413.2279965-2-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git