From patchwork Wed Aug 16 12:51:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9903607 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 510906038C for ; Wed, 16 Aug 2017 12:51:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4272E28962 for ; Wed, 16 Aug 2017 12:51:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3725A289E0; Wed, 16 Aug 2017 12:51:32 +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=ham 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 D05DA28962 for ; Wed, 16 Aug 2017 12:51:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B6FD6E486; Wed, 16 Aug 2017 12:51:30 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E3126E486 for ; Wed, 16 Aug 2017 12:51:29 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id x43so2911961wrb.1 for ; Wed, 16 Aug 2017 05:51:29 -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; bh=X9p6+KFQdBtqIIXaAYJwcdoKnLDeT2H+5qlPf9nxgf8=; b=dU5boMnZYNC2zXIqCwffiGXIBUj2MBhqlMITbc76zNg4s3V9h3NR90v8KFvhyeM4e9 JefYMoDnsxqpYKr8AJpX8032tOKI+Dyq4KrGoXuWXIh5MxvorkxFwqs6hsVMZyqvE9Oc v/Nxr7bHXgFX5pF5+0NFQDefkDrjemqGN/quI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=X9p6+KFQdBtqIIXaAYJwcdoKnLDeT2H+5qlPf9nxgf8=; b=N6mNpDPgZ+/puzzdc+3vQGXY+mjPTbc8Lu5+4FJ5GcnnMyUL5NnbIk+Z541OMKG01X ulWeQGQ8HnVDH/fEGrZ5IVmrKbVLjchpm6ZOeFOLxO/qu3rjerjHlV/bttgdmvPNQtpW Y6TKj7E0rjFb1TMvWG9EkAUvlGfxnjplnAIbVMfna3YBFRZykUzw2nPGGejuZLC3Be6D yO0TWqdkUnQ5qAc8efm+9FG8U4VlMp/jJwPodti2qbOLY0zQWgvYGhiAbpprgnpuZWBw 5xhio82r7+HB30YSV3af/2QCZPpSpTnlIZSUuTGjGLMFdm/Fbsap+vTb3Y0Y/iW5hKjw dp6w== X-Gm-Message-State: AHYfb5hJGa1SPC0lBYJ12KrGU9U3Z/lCTCrUKRYzQHFEJW+g45GylsAa uapvwNsJfT31mDhBFvo= X-Received: by 10.80.184.50 with SMTP id j47mr1902246ede.132.1502887887528; Wed, 16 Aug 2017 05:51:27 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56e6:0:e4bc:76a0:8042:669e]) by smtp.gmail.com with ESMTPSA id e30sm871183edd.84.2017.08.16.05.51.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 05:51:26 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 16 Aug 2017 14:51:20 +0200 Message-Id: <20170816125120.17971-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.13.3 Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH] dim: add error reporting for rerere cache pulling 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 This silently failed for me, and I had no idea what's happening. v2: Use git pull -q (Jani). Signed-off-by: Daniel Vetter --- dim | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dim b/dim index 85866488e0e0..124f9b374d4c 100755 --- a/dim +++ b/dim @@ -503,7 +503,14 @@ function update_rerere_cache echo -n "Updating rerere cache... " cd $DIM_PREFIX/drm-rerere/ - git pull &> /dev/null + if ! git pull -q ; then + echo "Failed to update the rerere cache." + echo "Please manually run" + echo " $ cd $DIM_PREFIX/drm-rerere ; git pull" + echo "and fixup any issues." + + return 1 + fi if [ ! -L $(rr_cache_dir) ] ; then if [ -d $(rr_cache_dir) ] ; then rm -Rf $(rr_cache_dir) @@ -524,7 +531,14 @@ function commit_rerere_cache if git_is_current_branch rerere-cache ; then remote=$(branch_to_remote rerere-cache) - git pull >& /dev/null + if ! git pull -q ; then + echo "Failed to update the rerere cache." + echo "Please manually run" + echo " $ cd $DIM_PREFIX/drm-rerere ; git pull" + echo "and fixup any issues." + + return 1 + fi git add ./*.patch >& /dev/null || true for file in $(git ls-files); do if ! git log --since="60 days ago" --name-only -- $file | grep $file &> /dev/null; then