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 130B54EF88 for ; Thu, 15 May 2025 14:24:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 4A63168C15E; Thu, 15 May 2025 17:23:56 +0300 (EEST) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6FE8168B7CC for ; Thu, 15 May 2025 17:23:48 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C0D8A1FCEC for ; Thu, 15 May 2025 14:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1747319027; 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=F9Nu4AbUXuEMAbrAHhSqsGa30Qhg4+iF1BMgBBXD0WM=; b=XmlHSeZYXyyiLLe8oJO37YxrqJ27wS/k0XIWpBWTaWMkbMp9oMikWjv5vtqU5Rdetj4/2u PwCDCtpTqNvLuPq56zwnXZ7fZkj8mTVRRi1IfrUQfElusXAAYE2oETys727xiNPU+Xhceq 9wxxQW1Ls6oqSOoT3qIzsQT8hnJ/yDg8IlQ4wWRGHuWILq3qtEzPcCeEHZ2geGjwD5d+M4 y4y4MnBODubc4Qm9VaD9NATvdzc4uCySUckYCwcGT3t23q22rmcq2d7pw69FiOmejU7XMT Q50tIpxpelvwMUlHwgUngfKvu9A58cM8LKYU1U4LcjVpHRqszykPep5bwY3KNg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 15 May 2025 16:23:45 +0200 Message-ID: <20250515142345.2586501-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250515142345.2586501-1-michael@niedermayer.cc> References: <20250515142345.2586501-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -85 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdefuddtuddtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdduhedmnecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeegjefhteeghffgledugedvuddvffegfedvtdehteelhfeuiedtveffveefheehgfenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeguddrieeirdeijedruddufeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeijedruddufedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrgh X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH v2 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 4dbfa898723..536e1664a43 100755 --- a/tools/merge-all-source-plugins +++ b/tools/merge-all-source-plugins @@ -18,6 +18,17 @@ merge(){ # $1=repository, $2=refspec suceeded="$suceeded $2" } +error(){ + echo $1 + exit 1 +} + +git diff --exit-code >/dev/null ||\ + error "Please commit local changes first" + +git diff --cached --exit-code >/dev/null ||\ + error "Please commit local changes first" + #version="12.34" 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".