From patchwork Tue Dec 18 10:30:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10735375 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F9826C5 for ; Tue, 18 Dec 2018 10:30:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 609E52A750 for ; Tue, 18 Dec 2018 10:30:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5500E2A779; Tue, 18 Dec 2018 10:30:37 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 0F1372A74C for ; Tue, 18 Dec 2018 10:30:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D73826EAFB; Tue, 18 Dec 2018 10:30:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id A318D6EAEC; Tue, 18 Dec 2018 10:30:23 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181218103022euoutp02cb4d557e9f7d4a61212fa0ffb079df0d~xZqjapjN41583015830euoutp02P; Tue, 18 Dec 2018 10:30:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20181218103022euoutp02cb4d557e9f7d4a61212fa0ffb079df0d~xZqjapjN41583015830euoutp02P Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181218103021eucas1p2aeb3539f2d3f688310fbceda18d31118~xZqi0v6dq2264622646eucas1p28; Tue, 18 Dec 2018 10:30:21 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 2C.CE.04294.D3CC81C5; Tue, 18 Dec 2018 10:30:21 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181218103021eucas1p110a4b7991baa1054fece0dc3b6c7d7f9~xZqiFhTec1239112391eucas1p1T; Tue, 18 Dec 2018 10:30:21 +0000 (GMT) X-AuditID: cbfec7f4-c77a99c0000010c6-a2-5c18cc3dbf6d Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 98.74.04284.D3CC81C5; Tue, 18 Dec 2018 10:30:21 +0000 (GMT) Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PJX00E1EH6JBQ40@eusync4.samsung.com>; Tue, 18 Dec 2018 10:30:21 +0000 (GMT) From: Andrzej Hajda To: dri-devel@lists.freedesktop.org, dim-tools@lists.freedesktop.org Subject: [maintainer-tools PATCH v2 3/4] dim: fix update_rerere_cache Date: Tue, 18 Dec 2018 11:30:15 +0100 Message-id: <20181218103016.8070-4-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20181218103016.8070-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEIsWRmVeSWpSXmKPExsWy7djP87q2ZyRiDG5dVba4te4cq8XGGetZ LbZ3PGe0uPL1PZvF2iN32R1YPe53H2fy6NuyijGAKYrLJiU1J7MstUjfLoErY/rvU+wFN7kq 5j2dzNzAuJmji5GTQ0LARKLh2hfWLkYuDiGBFYwSt+dchHI+M0qsPfGdFaaqbWczG0RiGaPE ox27mSGc/4wSPc9BMpwcbAKaEn833wSzRQRcJG79eMwCUsQs0MMoMfd6AzNIQljAVeLw5P9g NouAqsS1FwsZuxg5OHgFzCWufZWB2CYvsXrDAbASTgELie+T+9lB5kgIPGWV2HRmIhtEkYvE zo4JULawxKvjW9ghbBmJzo6DTBB2vUTTzCvMEM0djBInFi+HarCWOHz8IthvzAJ8EpO2TWcG OUJCgFeio00IosRD4sXlz1AvdzNKzJ71nXECo+QCRoZVjOKppcW56anFRnmp5XrFibnFpXnp esn5uZsYgTF1+t/xLzsYd/1JOsQowMGoxMO74qh4jBBrYllxZe4hRgkOZiUR3lulEjFCvCmJ lVWpRfnxRaU5qcWHGKU5WJTEeasZHkQLCaQnlqRmp6YWpBbBZJk4OKUaGPnZK5XaD26ulpp1 Zibz6o37XlQsjJBf0C0uGNkZ81RmYvRtz4Rdk1L2blpzdJeCRq+G1tzu3w4v5d5Yy13Suc8k cPwLb0rus/4d6Xa6XRL/ilhmPfvxoWqrxXWXBL09CYYfcmO3PuuoV+iaelOmX/XRQtM30XPM pyVO5bFZ7xMy86swA4uurxJLcUaioRZzUXEiAAJbsHylAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPJMWRmVeSWpSXmKPExsVy+t/xa7q2ZyRiDPZM5LC4te4cq8XGGetZ LbZ3PGe0uPL1PZvF2iN32R1YPe53H2fy6NuyijGAKYrLJiU1J7MstUjfLoErY/rvU+wFN7kq 5j2dzNzAuJmji5GTQ0LARKJtZzNbFyMXh5DAEkaJZU3X2SGcRiaJB0cXsIJUsQloSvzdfJMN xBYRcJG49eMxC0gRs0Afo0Tj31VgCWEBV4nDk/8zg9gsAqoS114sZOxi5ODgFTCXuPZVBmKb vMTqDQfASjgFLCS+T+5nB7GFgEour/zDNIGRZwEjwypGkdTS4tz03GJDveLE3OLSvHS95Pzc TYzAYNh27OfmHYyXNgYfYhTgYFTi4WU4IR4jxJpYVlyZe4hRgoNZSYT3VqlEjBBvSmJlVWpR fnxRaU5q8SFGaQ4WJXHe8waVUUIC6YklqdmpqQWpRTBZJg5OqQZGATXtO716jC+OWFmpyF5t 91PV/sPYPU0+8Ui8AP/8B81SORL1X1Qi48SDdL6VLM39GH0xPWyu8wU/pcs/bOd1dzy/a5D2 /v5tN70Du3d7XeOYuHxP4+lG/ZXv/596xBz5/NHVdL+Q5YFHy7ZuMTJiFjXddVZ4m7+/EhvH /JetFVo6V10n2G5VYinOSDTUYi4qTgQAdE62vwICAAA= X-CMS-MailID: 20181218103021eucas1p110a4b7991baa1054fece0dc3b6c7d7f9 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181218103021eucas1p110a4b7991baa1054fece0dc3b6c7d7f9 References: <20181218103016.8070-1-a.hajda@samsung.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Szyprowski , Bartlomiej Zolnierkiewicz MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP update_rerere_cache does not work correctly if drm-tip and $DIM_REPO are workdirs - it cannot locate properly rr-cache. Let's use git rev-parse to resolve rr-cache location. Signed-off-by: Andrzej Hajda --- dim | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dim b/dim index 3afa8b6..e4a4afe 100755 --- a/dim +++ b/dim @@ -554,15 +554,6 @@ function check_conflicts # tree true } -function rr_cache_dir -{ - if [ -d $DIM_PREFIX/drm-tip/.git/ ] ; then - echo $DIM_PREFIX/drm-tip/.git/rr-cache - else - echo $DIM_PREFIX/$DIM_REPO/.git/rr-cache - fi -} - function git_dir { local dir=${1:-$PWD} @@ -606,17 +597,25 @@ function pull_rerere_cache function update_rerere_cache { + local rr_cache_dir + echo -n "Updating rerere cache... " pull_rerere_cache - if [ ! -L $(rr_cache_dir) ] ; then - if [ -d $(rr_cache_dir) ] ; then - rm -Rf $(rr_cache_dir) + cd $DIM_PREFIX/drm-tip/ + + rr_cache_dir=$(git rev-parse --git-common-dir)/rr-cache + + if [ ! -L $rr_cache_dir ] ; then + if [ -d $rr_cache_dir ] ; then + rm -Rf $rr_cache_dir fi - ln -s "$DIM_PREFIX/drm-rerere/rr-cache" $(dirname $(rr_cache_dir)) + ln -s "$DIM_PREFIX/drm-rerere/rr-cache" $rr_cache_dir fi + cd ~- + echo "Done." }