[FFmpeg-devel] [PATCH] tools: Remove libav-merge-next-commit

[FFmpeg-devel] [PATCH] tools: Remove libav-merge-next-commit

[Derek Buitenhuis]

Libav is no longer extant.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 tools/libav-merge-next-commit | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100755 tools/libav-merge-next-commit

diff --git a/tools/libav-merge-next-commit b/tools/libav-merge-next-commit
deleted file mode 100755
index 9bd03fabf8..0000000000
--- a/tools/libav-merge-next-commit
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if [ "$1" != "merge" -a "$1" != "noop" ]; then
-    printf "Usage: $0 <merge|noop [REF_HASH]>\n"
-    exit 0
-fi
-
-[ "$1" = "noop" ] && merge_opts="-s ours"
-
-nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1)
-if [ -z "$nextrev" ]; then
-    printf "Nothing to merge..\n"
-    exit 0
-fi
-printf "Merging $(git log -n 1 --oneline $nextrev)\n"
-git merge --no-commit $merge_opts --no-ff --log $nextrev
-
-if [ "$1" = "noop" -a -n "$2" ]; then
-    printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG
-fi
-
-printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG
-- 
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".

Re: [FFmpeg-devel] [PATCH] tools: Remove libav-merge-next-commit

[Alexander Strasser via ffmpeg-devel]

[-- Attachment #1: Type: message/rfc822, Size: 7412 bytes --]

From: Alexander Strasser <eclipse7@gmx.net>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: derek.buitenhuis@gmail.com
Subject: Re: [FFmpeg-devel] [PATCH] tools: Remove libav-merge-next-commit
Date: Fri, 27 Jun 2025 00:05:08 +0200
Message-ID: <aF3EFIS0LaDCKFQr@metallschleim.local>

Hi Derek!

On 2025-06-23 22:40 +0100, Derek Buitenhuis wrote:
> Libav is no longer extant.
                     ^
Seems I just learned a new English word...

IMHO removal is OK. Should be no longer needed in this specific form.

I see the tool is still mentioned in doc/libav-merge.txt .
Not sure but maybe it can be removed as well?
Or the parts of the file that reference libav-merge-next-commit?


Best regards,
  Alexander

> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
>  tools/libav-merge-next-commit | 22 ----------------------
>  1 file changed, 22 deletions(-)
>  delete mode 100755 tools/libav-merge-next-commit
> 
> diff --git a/tools/libav-merge-next-commit b/tools/libav-merge-next-commit
> deleted file mode 100755
> index 9bd03fabf8..0000000000
> --- a/tools/libav-merge-next-commit
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -#!/bin/sh
> -
> -if [ "$1" != "merge" -a "$1" != "noop" ]; then
> -    printf "Usage: $0 <merge|noop [REF_HASH]>\n"
> -    exit 0
> -fi
> -
> -[ "$1" = "noop" ] && merge_opts="-s ours"
> -
> -nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1)
> -if [ -z "$nextrev" ]; then
> -    printf "Nothing to merge..\n"
> -    exit 0
> -fi
> -printf "Merging $(git log -n 1 --oneline $nextrev)\n"
> -git merge --no-commit $merge_opts --no-ff --log $nextrev
> -
> -if [ "$1" = "noop" -a -n "$2" ]; then
> -    printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG
> -fi
> -
> -printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG
> -- 
> 2.49.0

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".