From patchwork Tue Dec 18 10:30:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10735373 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 1B0331399 for ; Tue, 18 Dec 2018 10:30:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A7932A6FB for ; Tue, 18 Dec 2018 10:30:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2FA52A741; Tue, 18 Dec 2018 10:30:30 +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 B8CB12A6FB for ; Tue, 18 Dec 2018 10:30:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D025C6EAF2; Tue, 18 Dec 2018 10:30:24 +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 7766A6EAEE; Tue, 18 Dec 2018 10:30:23 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181218103022euoutp0239cb0f3cc5a274668db243b9abdf80ae~xZqi8OTLD1583015830euoutp02O; Tue, 18 Dec 2018 10:30:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20181218103022euoutp0239cb0f3cc5a274668db243b9abdf80ae~xZqi8OTLD1583015830euoutp02O Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181218103021eucas1p1053c6ee7c756136676d160ac237f5aca~xZqiW0XLf1239012390eucas1p1b; Tue, 18 Dec 2018 10:30:21 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id D6.7B.04441.D3CC81C5; Tue, 18 Dec 2018 10:30:21 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181218103020eucas1p2eaebe3908008d8f1e92465b07f1953f0~xZqhsW-ms2598125981eucas1p2v; Tue, 18 Dec 2018 10:30:20 +0000 (GMT) X-AuditID: cbfec7f2-a1ae89c000001159-7c-5c18cc3d9bbc Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id EA.49.04128.C3CC81C5; Tue, 18 Dec 2018 10:30:20 +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:20 +0000 (GMT) From: Andrzej Hajda To: dri-devel@lists.freedesktop.org, dim-tools@lists.freedesktop.org Subject: [maintainer-tools PATCH v2 1/4] dim: allow git_dir to specify arbitrary work directory Date: Tue, 18 Dec 2018 11:30:13 +0100 Message-id: <20181218103016.8070-2-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+NgFprIIsWRmVeSWpSXmKPExsWy7djP87q2ZyRiDN6v47C4te4cq8XGGetZ LbZ3PGe0uPL1PZvF2iN32R1YPe53H2fy6NuyijGAKYrLJiU1J7MstUjfLoErY/vbM0wF21gr lp69ztLAOJWli5GDQ0LARGLNP4cuRi4OIYEVjBJP71xggXA+M0rsPLedsYuRE6zoR/9EqMQy RonJ636DJYQE/jNKTFgjCWKzCWhK/N18kw3EFhFwkbj14zFYA7NAD6PE3OsNzCAJYYFEiU9T usBsFgFVidvHN4I18AqYS0z/u48JYpu8xOoNB8BqOAUsJL5P7mcHGSQhcJdV4vnh42wQRS4S y2YeYoawhSVeHd/CDmHLSFye3M0CYddLNM28wgzR3MEocWLxcqhma4nDxy+ygtjMAnwSk7ZN Z4YEBq9ER5sQRImHxMmlV5ggXu5mlDjS8ptpAqPkAkaGVYziqaXFuempxYZ5qeV6xYm5xaV5 6XrJ+bmbGIERdfrf8U87GL9eSjrEKMDBqMTDy3BCPEaINbGsuDL3EKMEB7OSCO+tUokYId6U xMqq1KL8+KLSnNTiQ4zSHCxK4rzVDA+ihQTSE0tSs1NTC1KLYLJMHJxSDYzB9dNfLZ721Os2 E7d92Bv35IeWexIEr/5VPtK86s5afduQihPRjUdePSlKYXSzuiYzpceAPTnyLq/h68AXlvI7 ueftsKqtP7roStMzPdbjGftK2DaynF3Aup5pYfUcw4MFAT82XK8QimIMuGrBuMHXlM3vMK94 Y0PHnEc7RbiP1hw18f+8arYSS3FGoqEWc1FxIgAeUaWnpAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAJMWRmVeSWpSXmKPExsVy+t/xa7o2ZyRiDC7ukbK4te4cq8XGGetZ LbZ3PGe0uPL1PZvF2iN32R1YPe53H2fy6NuyijGAKYrLJiU1J7MstUjfLoErY/vbM0wF21gr lp69ztLAOJWli5GTQ0LAROJH/0Qgm4tDSGAJo8SR5gvsEE4jk8Te7zuZQKrYBDQl/m6+yQZi iwi4SNz68Risg1mgj1Gi8e8qsISwQKLEpyldzCA2i4CqxO3jG8HivALmEtP/7mOCWCcvsXrD AbAaTgELie+T+9lBbCGgmssr/zBNYORZwMiwilEktbQ4Nz232EivODG3uDQvXS85P3cTIzAc th37uWUHY9e74EOMAhyMSjy8DCfEY4RYE8uKK3MPMUpwMCuJ8N4qlYgR4k1JrKxKLcqPLyrN SS0+xCjNwaIkznveoDJKSCA9sSQ1OzW1ILUIJsvEwSnVwOij1nxfSfuX/pSFih7zNlZqhUyd tmD/hvA0ndVeOnq2B8Nabr39N4m9N0dB4+sjGx8Tt19a6SbyS9cm/pNYm9Lcx22WMp3fbar6 0ZVi6ZVd2VXp3BptWxd7u3f9O5Nlv2dW51SxK02OFxJnLCks/MYRGdxz0L24pe8un9LNno/c heJmc2t3KbEUZyQaajEXFScCAFnWVcwDAgAA X-CMS-MailID: 20181218103020eucas1p2eaebe3908008d8f1e92465b07f1953f0 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181218103020eucas1p2eaebe3908008d8f1e92465b07f1953f0 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 git_dir function returns git directory for current working directory. Allowing specifying any directory allows to reuse it more widely. Signed-off-by: Andrzej Hajda Reviewed-by: Daniel Vetter --- dim | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dim b/dim index 70939ff..df66c58 100755 --- a/dim +++ b/dim @@ -565,10 +565,12 @@ function rr_cache_dir function git_dir { - if [ -d $PWD/.git ] ; then - echo $PWD/.git + local dir=${1:-$PWD} + + if [ -d $dir/.git ] ; then + echo $dir/.git else - cut -d ' ' -f 2 < $PWD/.git + cut -d ' ' -f 2 < $dir/.git fi } From patchwork Tue Dec 18 10:30:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10735369 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 87F0A6C5 for ; Tue, 18 Dec 2018 10:30:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 772B92A693 for ; Tue, 18 Dec 2018 10:30:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B8542A6FE; Tue, 18 Dec 2018 10:30:27 +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 AEF742A693 for ; Tue, 18 Dec 2018 10:30:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A69E46EAEE; Tue, 18 Dec 2018 10:30:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 535BD6EAED; Tue, 18 Dec 2018 10:30:23 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20181218103022euoutp01d5b04d7e4ed876a9f21233f9cc2b579d~xZqjH0dE20524505245euoutp01Z; Tue, 18 Dec 2018 10:30:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20181218103022euoutp01d5b04d7e4ed876a9f21233f9cc2b579d~xZqjH0dE20524505245euoutp01Z Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181218103021eucas1p1597030c75516fe40f88dc519d3d277eb~xZqilxdHl1427614276eucas1p1J; 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 9B.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 20181218103020eucas1p140d2f87d497add204bce944e3015e286~xZqhvmp3G1426414264eucas1p1G; Tue, 18 Dec 2018 10:30:20 +0000 (GMT) X-AuditID: cbfec7f4-c77a99c0000010c6-9f-5c18cc3d0c4d Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 87.74.04284.C3CC81C5; Tue, 18 Dec 2018 10:30:20 +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:20 +0000 (GMT) From: Andrzej Hajda To: dri-devel@lists.freedesktop.org, dim-tools@lists.freedesktop.org Subject: [maintainer-tools PATCH v2 2/4] dim: fix git directory handling Date: Tue, 18 Dec 2018 11:30:14 +0100 Message-id: <20181218103016.8070-3-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+NgFprIIsWRmVeSWpSXmKPExsWy7djP87q2ZyRiDL7eFbO4te4cq8XGGetZ LbZ3PGe0uPL1PZvF2iN32R1YPe53H2fy6NuyijGAKYrLJiU1J7MstUjfLoErY8nCNSwFZ/kq Tp9dytLA+JS7i5GTQ0LAROLymiksXYxcHEICKxgl+j9/gHI+M0rMfjWLHabq6sTLrBCJZYwS 17fuBUsICfxnlJiwRhLEZhPQlPi7+SYbiC0i4CJx68djsEnMAj2MEnOvNzB3MXJwCAt4SLQe jwGpYRFQlTjb9IsJxOYVMJe4ufAVC8QyeYnVGw4wg9icAhYS3yf3s4PMkRB4yipx6ex9Nogi F4nzt16zQtjCEq+Ob4G6VEais+MgE4RdL9E08wozRHMHo8SJxcuhmq0lDh+/CNbMLMAnMWnb dLDjJAR4JTrahCBKPCQ+X5zMBvFxN6PE+ylrmCYwSi5gZFjFKJ5aWpybnlpslJdarlecmFtc mpeul5yfu4kRGFGn/x3/soNx15+kQ4wCHIxKPLwrjorHCLEmlhVX5h5ilOBgVhLhvVUqESPE m5JYWZValB9fVJqTWnyIUZqDRUmct5rhQbSQQHpiSWp2ampBahFMlomDU6qBMV7kxIrLFf9V 20+uNPpzcn5LYbStZVvj44/STTcXzi/mWOGdwy8i9UiS+/TJ1D92B07uls9tvC3Cf6f/uYPw 14QLfDtCyxkm7r16sr9na/CV9WsO/peyvhQX/WL2nQjvUqfjadq3Zl2syOnTLrwnMHGaTrPT 1SjOypy3oeum1idNan5lWZ3Zq8RSnJFoqMVcVJwIAEUAlYmkAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHJMWRmVeSWpSXmKPExsVy+t/xa7o2ZyRiDHb/07W4te4cq8XGGetZ LbZ3PGe0uPL1PZvF2iN32R1YPe53H2fy6NuyijGAKYrLJiU1J7MstUjfLoErY8nCNSwFZ/kq Tp9dytLA+JS7i5GTQ0LAROLqxMusILaQwBJGiSk74rsYuYDsRiaJvd93MoEk2AQ0Jf5uvskG YosIuEjc+vGYBaSIWaCPUaLx7yqgBAeHsICHROvxGJAaFgFVibNNv8B6eQXMJW4ufMUCsUxe YvWGA8wgNqeAhcT3yf3sEIvNJS6v/MM0gZFnASPDKkaR1NLi3PTcYkO94sTc4tK8dL3k/NxN jMBQ2Hbs5+YdjJc2Bh9iFOBgVOLhZTghHiPEmlhWXJl7iFGCg1lJhPdWqUSMEG9KYmVValF+ fFFpTmrxIUZpDhYlcd7zBpVRQgLpiSWp2ampBalFMFkmDk6pBsZ5JjNKb5Z1P3ulajlX87fE wpsr2qOUH+hbul1bfPN9gfylnWsruStF2W6LZ12z7ZCdnxzn/z0kfbPy+d73v8yMdLT5hZtF z7/c6Jml357B8aOH6eacpLXfq44+qLrO/JbFkC35QMc6lsLwzEmBiQfeTn3IovF/RaT912+3 2atkDDeVnGUVXqvEUpyRaKjFXFScCABcXzHlAQIAAA== X-CMS-MailID: 20181218103020eucas1p140d2f87d497add204bce944e3015e286 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181218103020eucas1p140d2f87d497add204bce944e3015e286 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 Assumption that git directory is always located at REPO/.git is incorrect, especially in case of git worktrees. There is already function to deal with it correctly - git_dir, let's then use it. Signed-off-by: Andrzej Hajda Reviewed-by: Daniel Vetter --- dim | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dim b/dim index df66c58..3afa8b6 100755 --- a/dim +++ b/dim @@ -1088,12 +1088,7 @@ function dim_backmerge git merge --rerere-autoupdate --no-commit $upstream >& /dev/null || true - if [[ -d .git ]]; then - patch_file=".git" - else - patch_file=$(cut -d ' ' -f 2 .git) - fi - patch_file=$patch_file/MERGE_MSG + patch_file=$(git_dir)/MERGE_MSG cat > $patch_file <<-HERE @@ -1340,7 +1335,7 @@ dim_alias_mrr=magic-rebase-resolve function dim_magic_rebase_resolve { git diff HEAD | patch -p1 -R - dim_magic_patch < .git/rebase-merge/patch + dim_magic_patch < $(git_dir)/rebase-merge/patch make $DIM_MAKE_OPTIONS git add -u git rebase --continue @@ -2102,7 +2097,7 @@ function setup_aux_checkout # name url directory git clone --reference=$DIM_PREFIX/$DIM_REPO/.git $url $dir cd $dir git config remote.origin.url $url - echo "$DIM_PREFIX/$DIM_REPO/.git/objects" > .git/objects/info/alternates + echo "$(git_dir $DIM_PREFIX/$DIM_REPO)/objects" > $(git_dir)/objects/info/alternates git repack -a -d -l remote=origin fi @@ -2132,7 +2127,7 @@ function dim_setup fi cd $DIM_PREFIX - if [ ! -d $DIM_PREFIX/$DIM_REPO/.git ]; then + if [ ! -d $(git_dir $DIM_PREFIX/$DIM_REPO) ]; then echoerr "No git checkout found in $DIM_PREFIX/$DIM_REPO." echoerr "Please set up your maintainer linux repository at $DIM_PREFIX/$DIM_REPO with" echoerr " cd $DIM_PREFIX" 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." } From patchwork Tue Dec 18 10:30:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10735377 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 43EEF6C5 for ; Tue, 18 Dec 2018 10:30:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33D1D2A750 for ; Tue, 18 Dec 2018 10:30:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27AE22A77D; Tue, 18 Dec 2018 10:30:39 +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 B84CE2A750 for ; Tue, 18 Dec 2018 10:30:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 352BE6EAFC; Tue, 18 Dec 2018 10:30:36 +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 0361E6EAF4; Tue, 18 Dec 2018 10:30:25 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181218103023euoutp02cd6206f7d1e24b404d3ea0ecf013fa9b~xZqkrpGhA1576415764euoutp02d; Tue, 18 Dec 2018 10:30:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20181218103023euoutp02cd6206f7d1e24b404d3ea0ecf013fa9b~xZqkrpGhA1576415764euoutp02d Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181218103022eucas1p2bac6c8aae9d42318eb2e280c03d5ea0b~xZqjOXK9E2263822638eucas1p29; Tue, 18 Dec 2018 10:30:22 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id F4.E6.04806.E3CC81C5; Tue, 18 Dec 2018 10:30:22 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181218103021eucas1p26ba6f53a2d3c7580387473e610a43af0~xZqibsoyp0134401344eucas1p2K; Tue, 18 Dec 2018 10:30:21 +0000 (GMT) X-AuditID: cbfec7f5-367ff700000012c6-25-5c18cc3e4eee Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 2C.49.04128.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 4/4] dim: use git rev-parse to get git directory Date: Tue, 18 Dec 2018 11:30:16 +0100 Message-id: <20181218103016.8070-5-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+NgFprIIsWRmVeSWpSXmKPExsWy7djP87p2ZyRiDD5cZLO4te4cq8XGGetZ LbZ3PGe0uPL1PZvF2iN32R1YPe53H2fy6NuyijGAKYrLJiU1J7MstUjfLoErY8LqD4wFh1kq 2u8oNDDuY+5i5OSQEDCReHf1FpDNxSEksIJR4s6PfhYI5zOjxJJJmxlhqu5f+MwEkVjGKHFl 9SY2COc/o0TP82Y2kCo2AU2Jv5tvgtkiAi4St348BhvFLNDDKDH3egPYQmGBMInnk9Ywgdgs AqoSW7svgDXwCphL/J56FmqdvMTqDQfA6jkFLCS+T+5nBxkkIfCQVeLX7HlADgeQ4yJx4Ekd RL2wxKvjW9ghbBmJy5O7WSDseommmVeYIXo7GCVOLF7OBpGwljh8/CIriM0swCcxadt0ZoiZ vBIdbUIQJR4S55uWQ33ZzSjR19bJNIFRcgEjwypG8dTS4tz01GLjvNRyveLE3OLSvHS95Pzc TYzAiDr97/jXHYz7/iQdYhTgYFTi4WU4IR4jxJpYVlyZe4hRgoNZSYT3VqlEjBBvSmJlVWpR fnxRaU5q8SFGaQ4WJXHeaoYH0UIC6YklqdmpqQWpRTBZJg5OqQbGW/MqC/qMv5dtdje8Uid4 7nWJnuCZbZubP3XxzVDSlrX/rxEWdTff+WTNaifj9a/UBFWnp5dH/rLT80sylQjhmRl8KH/2 tH9rN5ecP/T485TDWgKvzm7/H9csOtO+Y8mvVS6O+y+uEU97Uz194561ok5pPwpf+E+8Vpih XG4x94WVl47MTGZNJZbijERDLeai4kQAYCPsXKQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPJMWRmVeSWpSXmKPExsVy+t/xa7q2ZyRiDCbvkbW4te4cq8XGGetZ LbZ3PGe0uPL1PZvF2iN32R1YPe53H2fy6NuyijGAKYrLJiU1J7MstUjfLoErY8LqD4wFh1kq 2u8oNDDuY+5i5OSQEDCRuH/hM1MXIxeHkMASRokX75dAOY1MEg+OLmAFqWIT0JT4u/kmG4gt IuAicevHYxaQImaBPkaJxr+rwBLCAmESzyetYQKxWQRUJbZ2XwCL8wqYS/yeepYRYp28xOoN B8BWcwpYSHyf3M8OYgsB1Vxe+YdpAiPPAkaGVYwiqaXFuem5xUZ6xYm5xaV56XrJ+bmbGIHB sO3Yzy07GLveBR9iFOBgVOLhZTghHiPEmlhWXJl7iFGCg1lJhPdWqUSMEG9KYmVValF+fFFp TmrxIUZpDhYlcd7zBpVRQgLpiSWp2ampBalFMFkmDk6pBsaN8ek+7Aw6cm0d8ssvCgrOmvBP pNhpifGDoI4dk9iKJEpUfh/fzlIo7zH37JwmnwkaTz6nsn98d84oL3+9j/OfBNfcH33rj/y7 1XliN0N/1rMNjq13tM8JFD067+sbE7o42leZf6aR7tzgpRbPxX5F811Vud9YOmHB9e6K8Oub S+YfDPucZK3EUpyRaKjFXFScCABolaNjAgIAAA== X-CMS-MailID: 20181218103021eucas1p26ba6f53a2d3c7580387473e610a43af0 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181218103021eucas1p26ba6f53a2d3c7580387473e610a43af0 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 Using rev-parse git option is safer than manually parsing git files. Signed-off-by: Andrzej Hajda --- dim | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dim b/dim index e4a4afe..e999409 100755 --- a/dim +++ b/dim @@ -556,13 +556,7 @@ function check_conflicts # tree function git_dir { - local dir=${1:-$PWD} - - if [ -d $dir/.git ] ; then - echo $dir/.git - else - cut -d ' ' -f 2 < $dir/.git - fi + git -C ${1:-$PWD} rev-parse --absolute-git-dir } function pull_rerere_cache