From patchwork Wed Nov 27 19:53:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 11264851 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4972138C for ; Wed, 27 Nov 2019 19:53:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A528720835 for ; Wed, 27 Nov 2019 19:53:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="epliJ1zm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727387AbfK0Txx (ORCPT ); Wed, 27 Nov 2019 14:53:53 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39673 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727372AbfK0Txx (ORCPT ); Wed, 27 Nov 2019 14:53:53 -0500 Received: by mail-pg1-f193.google.com with SMTP id b137so9149088pga.6 for ; Wed, 27 Nov 2019 11:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=d1AG+rPKY26gU4AjXr/WO4BMUs1TbXq2102nCb0bGWo=; b=epliJ1zmXDobUIEkRtE+g/vAkVBKa4ZIXVP+OGwJPDhBYNWowxcFOL5Byy/u65ChPQ augnm9JsbDZP8c4FDvjHRkd911NO5lkGkLbqCP6Swv46E1zx0zrzW1fQ5vd42Lcvu48/ y62kw+9LVvk1JirQyxYytBj1Aoiu+U9EpOvKUyzt5uCG/7MXs7EzjQV+Km0CNeWA7FHQ ENaKBhkAkV5pEnaTPeImgeJSlpiW+Pbm2csoV5dLl+25AARPyboQkVt1oDhXLwFy5Le5 VZus+AM8t2lpYGnAmwVJquPUcQqFVPPh5R3Iwg1DvrtWoe+4JDqZlFZc0YYu80aOzgbB QD8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=d1AG+rPKY26gU4AjXr/WO4BMUs1TbXq2102nCb0bGWo=; b=GjU4YQclxuD2uxABdVssn49J/sPoHiJLE8Owa84zprdbtx7iNL1eDpYLpHvd4hBUb3 c7Kqu4SUKWysPlMWZ4hq9YnpQ7mPfnnO4Ne4pxwtDtgRrTGrzqVezSdh2eeFr4pWpuyG gmEgny0si61ryj0bi9bi5Yc4gAq1e9JGwMyuiMkk9o2x5mun+ck7n1jj/R+IA55vlkHi lLRQcX90oQ+bQJBmn2VNw87sF+6zawzD3QniksFCzUO9PIaAUAl61y+0pEIA/mOS+ovc 28QZUyHoKdTdmgENzfWFZ99Bhdw+fkBetoqxeDC5a1+kvewOaG8VuIhuXz3j5Rm0T05H f3AQ== X-Gm-Message-State: APjAAAU/odXf023P0c4+SJYi5/fKOiwrGF+AQntsMXA6YPRpOY82r449 eqwrH1C4hEADgcas2bvlkNLAsRBK X-Google-Smtp-Source: APXvYqw0KQI7MAWYYHk/RYxww4w3ZojL3/qg+4nvkX+KuObKJF8KbWk+2VRzD+KKtMKDU/4AMu6aSw== X-Received: by 2002:a62:e716:: with SMTP id s22mr48969836pfh.258.1574884431861; Wed, 27 Nov 2019 11:53:51 -0800 (PST) Received: from generichostname ([204.14.239.138]) by smtp.gmail.com with ESMTPSA id y14sm18087001pff.69.2019.11.27.11.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 11:53:51 -0800 (PST) Date: Wed, 27 Nov 2019 11:53:49 -0800 From: Denton Liu To: Git Mailing List Cc: Eric Sunshine , Junio C Hamano , Jeff King Subject: [PATCH v5 20/26] t7700: move keywords onto their own line Message-ID: <82bf24d06ab663d404a717ae9091dd272d1c3396.1574884302.git.liu.denton@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.2 (2019-09-21) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The code style for tests is to have statements on their own line if possible. Move keywords onto their own line so that they conform with the test style. Signed-off-by: Denton Liu --- t/t7700-repack.sh | 51 +++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index 8936928387..a96e876c4e 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -29,10 +29,12 @@ test_expect_success 'objects in packs marked .keep are not repacked' ' mv pack-* .git/objects/pack/ && git repack -A -d -l && git prune-packed && - for p in .git/objects/pack/*.idx; do + for p in .git/objects/pack/*.idx + do idx=$(basename $p) test "pack-$packsha1.idx" = "$idx" && continue - if git verify-pack -v $p | egrep "^$objsha1"; then + if git verify-pack -v $p | egrep "^$objsha1" + then found_duplicate_object=1 echo "DUPLICATE OBJECT FOUND" break @@ -45,10 +47,12 @@ test_expect_success 'writing bitmaps via command-line can duplicate .keep object # build on $objsha1, $packsha1, and .keep state from previous git repack -Adbl && test_when_finished "found_duplicate_object=" && - for p in .git/objects/pack/*.idx; do + for p in .git/objects/pack/*.idx + do idx=$(basename $p) test "pack-$packsha1.idx" = "$idx" && continue - if git verify-pack -v $p | egrep "^$objsha1"; then + if git verify-pack -v $p | egrep "^$objsha1" + then found_duplicate_object=1 echo "DUPLICATE OBJECT FOUND" break @@ -61,10 +65,12 @@ test_expect_success 'writing bitmaps via config can duplicate .keep objects' ' # build on $objsha1, $packsha1, and .keep state from previous git -c repack.writebitmaps=true repack -Adl && test_when_finished "found_duplicate_object=" && - for p in .git/objects/pack/*.idx; do + for p in .git/objects/pack/*.idx + do idx=$(basename $p) test "pack-$packsha1.idx" = "$idx" && continue - if git verify-pack -v $p | egrep "^$objsha1"; then + if git verify-pack -v $p | egrep "^$objsha1" + then found_duplicate_object=1 echo "DUPLICATE OBJECT FOUND" break @@ -83,8 +89,10 @@ test_expect_success 'loose objects in alternate ODB are not repacked' ' git commit -m commit_file3 && git repack -a -d -l && git prune-packed && - for p in .git/objects/pack/*.idx; do - if git verify-pack -v $p | egrep "^$objsha1"; then + for p in .git/objects/pack/*.idx + do + if git verify-pack -v $p | egrep "^$objsha1" + then found_duplicate_object=1 echo "DUPLICATE OBJECT FOUND" break @@ -99,10 +107,13 @@ test_expect_success 'packed obs in alt ODB are repacked even when local repo is git repack -a && myidx=$(ls -1 .git/objects/pack/*.idx) && test -f "$myidx" && - for p in alt_objects/pack/*.idx; do + for p in alt_objects/pack/*.idx + do git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" - done | while read sha1 rest; do - if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then + done | while read sha1 rest + do + if ! ( git verify-pack -v $myidx | grep "^$sha1" ) + then echo "Missing object in local pack: $sha1" return 1 fi @@ -119,10 +130,13 @@ test_expect_success 'packed obs in alt ODB are repacked when local repo has pack git repack -a -d && myidx=$(ls -1 .git/objects/pack/*.idx) && test -f "$myidx" && - for p in alt_objects/pack/*.idx; do + for p in alt_objects/pack/*.idx + do git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" - done | while read sha1 rest; do - if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then + done | while read sha1 rest + do + if ! ( git verify-pack -v $myidx | grep "^$sha1" ) + then echo "Missing object in local pack: $sha1" return 1 fi @@ -144,10 +158,13 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' ' git repack -a -d && myidx=$(ls -1 .git/objects/pack/*.idx) && test -f "$myidx" && - for p in alt_objects/pack/*.idx; do + for p in alt_objects/pack/*.idx + do git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" - done | while read sha1 rest; do - if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then + done | while read sha1 rest + do + if ! ( git verify-pack -v $myidx | grep "^$sha1" ) + then echo "Missing object in local pack: $sha1" return 1 fi