From patchwork Tue Sep 26 20:38:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 5301 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp4253848jaa; Tue, 26 Sep 2017 13:38:29 -0700 (PDT) X-Received: by 10.28.210.72 with SMTP id j69mr4540171wmg.75.1506458309111; Tue, 26 Sep 2017 13:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506458309; cv=none; d=google.com; s=arc-20160816; b=XwrtPO2u6Do4vrIqX+csNd+QbpAnDEf82hEjArypMx2uUQR7L78VkQo/VtYHIYgg3/ 5kf9XFffyQEHgqMguVLjNShRyWaLCkYRTAAqg14+dwA00X29F2X+iJ7g5bSAFsiwfwkX iTVg+qIMJOG1P/9OOVmH9ZhDMTnXcKn/6WLNSWOc4ZsWPCSP5YR+D118G2Pf8HcypmyG sZzVX3OytVQaoyJsMRqDdrHelDwAqMhd46cmNvNpLIvv6F8nzp3gUTfUEJKPmM5dhL0z mWMOYbrBmcm/k7IHrNnoOsUCWOXGsekFl7k8xtCb2lvIvyub2kXW42H7KHsfu5W/QcPp tlhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=ux0ix9l/995JLdDlraE3sElKWW8tKegDNvUQNX8gZZM=; b=huK/83BvPAfFUwvlAiT8CWggR7fseoi8Rkjwxkbaw2LBkf0qOMGripKyAi8doPOLpI +hWRBdep3TPd94nvyGF7qliXLRHt6EnR8nYO0KNQR6fyEIoPiCRohKXxvoZjso2g9xuy crPXcH4Ru9q2/7JaT1TcUZDpPOtIRPcb+BSiso5BPZHXwVRyEP1A0XquUlZ48ejJmZaO hN6nl1ncHCmE1F9fqIEtuBdiOHecZXT/8ph3PdXWTY9CkRSPG/2c0fOwc83EnJ9M2fYt cGyaVXc269qcbrB5d/LqB/H4WJ6ZwcYmVlRO7Su43Cs3JRI2cEgaN2TZWV7TM9uGta79 A9AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EKw6A1jH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o9si2070890wmo.187.2017.09.26.13.38.27; Tue, 26 Sep 2017 13:38:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EKw6A1jH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DC47680410; Tue, 26 Sep 2017 23:38:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f171.google.com (mail-io0-f171.google.com [209.85.223.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1315D6802D1 for ; Tue, 26 Sep 2017 23:38:08 +0300 (EEST) Received: by mail-io0-f171.google.com with SMTP id g32so13918383ioj.2 for ; Tue, 26 Sep 2017 13:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=rf3RSiMvrgm/i0s1/d9aGQLg9oL2iv4rdbA41zgmTx8=; b=EKw6A1jHVwJoQ6fEUN2SE4fo9nPN1OVV1BBY7xRL6N+qgYFKb3/75W1Zz7V2HyrATB gM6ljuN/ObfYtK64TBXiAzGxyazDJpI0WiP5uc4RxKCWKXNxyiDeMukGiRM5t/rhS1AF cYCVyNuKyD6gXxje7cnufUoLVAd1kfMERtgU2FKJNeJtGt+E+C93zx4Q+KtfC+o/JELA uf8Stujf8yXi7ZE9KcZ+qc//uXFqm+KfxLg9IKA+1YobmQ7l3D4dAQ5YEF/BZAnQYXDC FRmfBPpdmteQTQ+WNRh+uq39FpWlR3a2UH2qRU8LeSeWQpDu9IrAjUvJZdvdoGydgLmV qc5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=rf3RSiMvrgm/i0s1/d9aGQLg9oL2iv4rdbA41zgmTx8=; b=d15D8dXmO3BOHamh8GLQm4EGBR2olrdhV9Cdy4Gj7JtnYAkhlyQ0cQfAzcAOJFW8y/ IPrXIg4pIMDR8IrxWNTbNDnjG5DXlt4o/aG0Gj9XGC1Nn1ekCYsOSiKk9dK91neayV9X k71DxUfeu4igPZifKUKYojOzB6ramSmswpacthLVJhQ5mZTSUiQLLO+s6T+MIluaFR2Z vA/QZEWtliVg1HuTT6aJiuaP0MnndQwXQWp0JmVPrQYTBDdN3CyAppwv8PcIqb8DRR0G 1jxU7hjHzz6AhOhtxBYbxkMhRt4jXXvzwOBbMaFSSftpnzSBZxcplcNoBvngymX6P8LM Mkvg== X-Gm-Message-State: AHPjjUhT3J6uBowL6oFRb/g2O/pKH1rFotjAcD/j2HOdIwHt1Z/b72aS +RWDxrJn2r3kD8CYpY+m43le5d2y X-Google-Smtp-Source: AOwi7QAlAETEMQ1CAMlCbiADOZs64tjWIdbtKt6YyWYL8kZwLaLo20g73tq2KO8aV3gLlpxSj7SjAg== X-Received: by 10.107.164.28 with SMTP id n28mr15562272ioe.175.1506458298426; Tue, 26 Sep 2017 13:38:18 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id i19sm3089513ioi.38.2017.09.26.13.38.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 13:38:17 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Sep 2017 15:38:12 -0500 Message-Id: <20170926203812.90093-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] tools/libav-merge-next-commit: run properly on a branch that isn't master X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- tools/libav-merge-next-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libav-merge-next-commit b/tools/libav-merge-next-commit index 9bd03fabf8..e2674008f6 100755 --- a/tools/libav-merge-next-commit +++ b/tools/libav-merge-next-commit @@ -7,7 +7,7 @@ fi [ "$1" = "noop" ] && merge_opts="-s ours" -nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1) +nextrev=$(git rev-list libav/master --not HEAD --no-merges | tail -n1) if [ -z "$nextrev" ]; then printf "Nothing to merge..\n" exit 0