From patchwork Tue Oct 18 12:13:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9382057 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7FC0B60839 for ; Tue, 18 Oct 2016 12:14:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7174829599 for ; Tue, 18 Oct 2016 12:14:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65FBD2959F; Tue, 18 Oct 2016 12:14:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1054029599 for ; Tue, 18 Oct 2016 12:14:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 232ED6E6E6; Tue, 18 Oct 2016 12:14:53 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 31EA46E6DA for ; Tue, 18 Oct 2016 12:14:11 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id b75so32050008lfg.3 for ; Tue, 18 Oct 2016 05:14:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WtxwWG0qdnOojLRd0qsWW3d8FAy+fZpyA8bRwl/QCH4=; b=GeqqXW+Q33SU3iK2JNmGmgFd8PkMi131t0XuB7KtI2PPCIWsfmkf635e3leRKSmNAk jibA+LgxPhZqDI79GI8VgM+0kKpVFtX+cswPv9OdOonTXunNjQMcMpgBRTSPPN0HQxdJ d2Lzj2un9ciX6qYp/fluVLWNT+v/sS8pmnHWM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WtxwWG0qdnOojLRd0qsWW3d8FAy+fZpyA8bRwl/QCH4=; b=gk7vFUtFDBF8/aqco0vgBymYbOaEtW1YkMANyw9d/lP4Y3QMvXi8P2psl5ZQfv69q/ xTOubiRS7I8i9a9irDwpkMUS1LDDltFvpewXyUoC696qZA4uhHkEnR8fnbVMmsQR+lN3 EP2vh2Lri5RlErDi4qJOrfMyaUnEyUT5HB8/iHcbbw5HhkKdMCo8GrmDQ5IMrJIzbwOT g4G8gHsmWOykEe5vyG6m8g7kBLMfTIaBcG4VdolPoCG20jqwFXGC0DUUmxWUdibNn+bG WpcDL69I8pQm6fvcOL6kR74kkB6gE/50blvyNizcY4qB1PLUY/ibYGh+eVHry0O7zSMf kdEg== X-Gm-Message-State: AA6/9RmRW4N13L77TXJIx0mhwUJxgvTyUni9bkz6L+9xvDbnYcQrDqdc1Zl3GtcxFLvZvA== X-Received: by 10.28.54.142 with SMTP id y14mr12176829wmh.11.1476792849061; Tue, 18 Oct 2016 05:14:09 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id c7sm62390226wjk.19.2016.10.18.05.14.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Oct 2016 05:14:08 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 18 Oct 2016 14:13:52 +0200 Message-Id: <20161018121356.9594-6-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161018121356.9594-1-daniel.vetter@ffwll.ch> References: <20161018121356.9594-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , DRI Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 06/10] dim: Nuke nightly-forget X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP With our proliferation of branches it's become long useless. Nowadays my MO is to revert the offending commit in the rerere-cache branch explicitly, remove drm-intel-nightly/.git/rr-cache and then re-run rebuild-nightly. That works much better, hence nuke this helper. Signed-off-by: Daniel Vetter --- TODO | 2 -- dim | 9 --------- 2 files changed, 11 deletions(-) diff --git a/TODO b/TODO index ac0f27763dfa..c1c6e20eb0e3 100644 --- a/TODO +++ b/TODO @@ -1,8 +1,6 @@ dim: - extract the integration tree logic and make it generally useful, maybe for a drm-integration tree ... -- Improve nightly-forget to forget a specific merge instead of just the first - dinq/dif merge. - add option to check-patch to check stdin - integrate ninja-check? Or too much checkers considered harmful? https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2014-May/000554.html diff --git a/dim b/dim index 80baf24e4ad7..48d5e7b6477a 100755 --- a/dim +++ b/dim @@ -395,15 +395,6 @@ function dim_rebuild_nightly update_linux_next } -function dim_nightly_forget -{ - cd $DIM_PREFIX/drm-intel-nightly - git fetch origin >& /dev/null - git reset --hard origin/drm-intel-next-queued >& /dev/null - git merge origin/drm-intel-fixes - git rerere forget -} - # push branch $1, rebuild nightly. the rest of the arguments are passed to git # push. function dim_push_branch