From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 0858D4EF88 for ; Thu, 15 May 2025 13:04:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 630E268BFC6; Thu, 15 May 2025 16:04:22 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B2E6268B6EF for ; Thu, 15 May 2025 16:04:15 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B99EE439F9 for ; Thu, 15 May 2025 13:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1747314254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=T23XKID8zDGrMgiFAfvjb+ZF9KyW2fpEYpdLRzCk2XE=; b=IERExnx2zk9FoAl6czHkMMGv2Wf+83v9WhQfzYzNla/PMOGn8gS+rH6lMqsZfuFvNMVPSv qKo8u5A3i4LqYgiiw+bVBj8Duz71RuF6ySb2AcoxjvNfT6iV1ysOQjmLjlAKmjsBNH814U 8U2S5CU22OnhtR3Fy9bYoL+kNaaeGcCLh0M5PCNwpy06ec1Ec5UOUyFFphyMAXTz9/fFLa ouBVgF3D3L45Wn1LD9eJjFIEkhlZUGG+2fsK1Jc+kYpX2dzymsIH6L6B6dFL48VPhre4MP at5jhGDr6a//bk6k1rva4v2a8+7mwJIX5Tl3iNf0PwfJsukKW6+CAv03N/POhQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 15 May 2025 15:04:12 +0200 Message-ID: <20250515130413.2279965-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -85 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeftdelleegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdduhedmnecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeejffeufeffveevtdfhueevtdefjeetheeiteffheetgedvudduvedtffefjefhleenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeguddrieeirdeijedruddufeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeijedruddufedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrgh X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/2] tools/merge-all-source-plugins: Try merging a tag or branch matching the current version first X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Michael Niedermayer --- tools/merge-all-source-plugins | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) mode change 100644 => 100755 tools/merge-all-source-plugins diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins old mode 100644 new mode 100755 index 20764a07737..05f4fe5e97b --- a/tools/merge-all-source-plugins +++ b/tools/merge-all-source-plugins @@ -1,3 +1,10 @@ #!/bin/sh -git pull --no-rebase --log --stat --commit --no-edit https://github.com/michaelni/FFmpeg.git sourceplugin-libpostproc +merge(){ # $1=repository, $2=refspec + git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2-$version || \ + git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2 +} + +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".