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 767D44EF69 for ; Thu, 15 May 2025 13:04:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id ACAF568C15E; Thu, 15 May 2025 16:04:24 +0300 (EEST) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1C8C168BFC6 for ; Thu, 15 May 2025 16:04:17 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4B9A342DF9 for ; Thu, 15 May 2025 13:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1747314256; 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: in-reply-to:in-reply-to:references:references; bh=i6WTD7lUGfEqhfTDE9HGaCXfAlpN2iLdjpWkWgEHXaA=; b=b51+HQRNRmRNuk1Y64JuqIDB17JHYTKXzWbdM84U37JVgdz6eSvvKnnXF77j3xBCR8yor8 DwkAAFBYbAonAVMdKjPI1wtBkhcn2mngOWG/Wsk70Cpwd4SOPDgMEm4aUEf1c+LSkiCETl oSGpEdphgt2oBUfHyjcrN3XVCsIC49HXWkm1tP1WdpacwhEp+z1f+0wDAN+YjZzLaIKYMF DfBMO8/XPlD6S4jVlBuz3vSPe+TF9MSVdsF1NWA+o8vGwTPjL5NSdWxiwcrGiJVlsKngHs gmXtrMQ7S2LtAcYCtB/6pgptqGjPLy58O3ojVuBB7VMDFsH30SF8Vza4J3C8SQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 15 May 2025 15:04:13 +0200 Message-ID: <20250515130413.2279965-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250515130413.2279965-1-michael@niedermayer.cc> References: <20250515130413.2279965-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -85 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeftdelleehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdduhedmnecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeegjefhteeghffgledugedvuddvffegfedvtdehteelhfeuiedtveffveefheehgfenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeguddrieeirdeijedruddufeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeijedruddufedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrgh X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] tools/merge-all-source-plugins: Check that there are no uncommited changes 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 | 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".