From patchwork Thu Nov 21 22:20:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257003 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 4E37214DB for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2582C206D8 for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R6i14c9W" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726563AbfKUWUa (ORCPT ); Thu, 21 Nov 2019 17:20:30 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40621 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726380AbfKUWUa (ORCPT ); Thu, 21 Nov 2019 17:20:30 -0500 Received: by mail-wm1-f67.google.com with SMTP id y5so5477187wmi.5 for ; Thu, 21 Nov 2019 14:20:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=O4PZbbpNP8/K2E2AaCmUrYDEXvuy3j4vP7qs7Pp0jLU=; b=R6i14c9W4wFtv/X4jOxUFcYElfRN59Y/MxJ0/I9nEnsvOXQCFffdcDlR5qEannRI4e 9JQuSOMbZxwLx4Ih34BpL+JS5Nh71HJISyDCRY1Affzu/Tr4diZMNGbSirOPBuh8fFtV L3EyoY4nl62pNn+mLG3iY6EUZN9Fy8M3iId8H3GibU1JGI9Q8JcG2y4LBPc/vLC2A2eK 5j56YI+v65OuxDRiE018yxvZKJ8d1AwCMgDANT+uyo8tH6kd/pCLjWhcb87fFI4q5tDs HUe155PKwvxdQNXx0TbZCaLQU5KH1zdzXSdw3I+LzHVvjOhFJ59sVMy4exj4/prEImba KEHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=O4PZbbpNP8/K2E2AaCmUrYDEXvuy3j4vP7qs7Pp0jLU=; b=OJdH93h0fQdu7PL5UL6JE+mA4L+61iX6tMUZB4JvQNN0fmc81gaTumWd0dQ9nXbb1J ItWgC3zXfHLPFYY8Gw0Sq/xXkFQRJ+dsuu8w6u00nXWjNJWgsY8zSKFzkcccL/LvCsUF L2zm2L5r/cl1nL3MSptfKmOty5ejp8Kar/m+Fl89ZF1v/yYswi8B3othf8WjP3DY5oyM x4XICOrWoYIE+VAsJMMiojuFlJZfabiVrLLMRX7ikR6TAcV+KQ0DJ1yz7I3E7Yym3zpF qhGM2zPFJTFIASa1T4UNOcCwEy/ud0bY+707EYlSF8NxdErCfWuuTZhv8Pdzkpd0vPFt xxRg== X-Gm-Message-State: APjAAAVaNvxt5mP2XZXZzD+M6M3fBmH1nugO+apW43BiTVdHqLDpRiAw Dg3vw1cR8rY1h293xrOY4Fv62yDi X-Google-Smtp-Source: APXvYqyhPT1I78djhlbZBDrWtNukU6SGO5XVRwxYvCfQ2Jnpsd35P9PjzwCtvedckOLwgKjPXLpMNA== X-Received: by 2002:a1c:cc1a:: with SMTP id h26mr1707565wmb.40.1574374828098; Thu, 21 Nov 2019 14:20:28 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u4sm4897169wrq.22.2019.11.21.14.20.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:27 -0800 (PST) Message-Id: <9bf5a803e6d44ce1ff03225e57933c97c8841327.1574374826.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:16 +0000 Subject: [PATCH 01/11] fsmonitor: disable in a bare repo Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee t0003-attributes.sh Signed-off-by: Derrick Stolee --- config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config.c b/config.c index 3900e4947b..f6d4e2fae3 100644 --- a/config.c +++ b/config.c @@ -2339,6 +2339,11 @@ int git_config_get_max_percent_split_change(void) int git_config_get_fsmonitor(void) { + if (!the_repository->worktree) { + core_fsmonitor = 0; + return 0; + } + if (git_config_get_pathname("core.fsmonitor", &core_fsmonitor)) core_fsmonitor = getenv("GIT_TEST_FSMONITOR"); From patchwork Thu Nov 21 22:20:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257005 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 75908112B for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56922206CB for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nhcIA+gb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726655AbfKUWUb (ORCPT ); Thu, 21 Nov 2019 17:20:31 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38315 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbfKUWUa (ORCPT ); Thu, 21 Nov 2019 17:20:30 -0500 Received: by mail-wm1-f65.google.com with SMTP id z19so5504191wmk.3 for ; Thu, 21 Nov 2019 14:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=N7BpB5RWCvP7cXCsjV2ky6XQsXuoft0O5Ooe0jhkmsw=; b=nhcIA+gb5uMqYxZHu/4SbyEIqYqnSwkLsyB4KbU0BjbvwprtVIK+Plc9IVeE/K4wQb utp6FC/3aY2YT/6RQyiLTZKul4WwgIg+knkSBCidUGNptiYjnMvvBj55mgd+RhkKzkDO Ge2X70rnUIgpBN2cB+a+5OJ5q5L/IFkjBqGtYqP/XvfeREgIoKhTECGTd7ltLi4M8C5x Lmgxb0V0xgrzKjBfcYN0Hyt4uAubAyGiCjNzl1UD9e8kf9lGnXC6au+eKcegbQm4UgDY TwvkLsmPEoZewe2x1NMNxdGe3HRYL2LgIeX3mGckqdUzsw+/40FOxtR8OLVUCl8TBGiY 6NhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=N7BpB5RWCvP7cXCsjV2ky6XQsXuoft0O5Ooe0jhkmsw=; b=fR7rrxAA0E8TCmX/J6/zhjBjtRDZGH1YtefcsQxbCIFfFGsiCxw70wxL+QH+zrDgO/ wUeAdPCOteYViyOCBaEqwPrbaG/HCaoNqwiFo/6s7I/sWXXq7Js60cg/0DKmMk87QHqk YHCbn3qzO0IbSlp3VX/STnfjE9viHe/rRd+hgK4ZdI4tcHgKkpMz/2N2iTEfa+6i+avL 2vIC3mAgAXSmz+XGPz5eNqo1HDIme87kl0+tePP5HHmJ4hKvO0mQahQVIXVOYU/2jhci i4R9FvPzL9IkIY6Q4wYsoCPCCRQ4uKxgBYeZrbKcbLgl8nRbGA/+A1Wndnidha/FKgxf nfCA== X-Gm-Message-State: APjAAAXZAH12okaRjY0inWNAqqWWK/3cY53OsvMX7oL4/rsz0oKaCEpA DXOpj7ANaKocCYFNce+hy81RzSxI X-Google-Smtp-Source: APXvYqyt5c8IWcKU5c9ApJBN+wnhsQF+ycWy9urg1iFqK2vV2UKoQwKc949W9sxS2Yw2xEHEbmrbMw== X-Received: by 2002:a7b:c308:: with SMTP id k8mr12502753wmj.32.1574374828748; Thu, 21 Nov 2019 14:20:28 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y6sm4719968wrr.19.2019.11.21.14.20.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:28 -0800 (PST) Message-Id: <245cc1b2cc778de486b1ae5177baac3ae3fb93c5.1574374826.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:17 +0000 Subject: [PATCH 02/11] fsmonitor: do not output to stderr for tests Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee t0003-attributes.sh Signed-off-by: Derrick Stolee --- t/t7519/fsmonitor-watchman | 1 - 1 file changed, 1 deletion(-) diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman index d8e7a1e5ba..06312876aa 100755 --- a/t/t7519/fsmonitor-watchman +++ b/t/t7519/fsmonitor-watchman @@ -94,7 +94,6 @@ sub launch_watchman { my $o = $json_pkg->new->utf8->decode($response); if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { - print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; $retry--; qx/watchman watch "$git_work_tree"/; die "Failed to make watchman watch '$git_work_tree'.\n" . From patchwork Thu Nov 21 22:20:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257007 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 9D1AA1871 for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E267206CB for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bDXSuBK2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726686AbfKUWUb (ORCPT ); Thu, 21 Nov 2019 17:20:31 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42826 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbfKUWUb (ORCPT ); Thu, 21 Nov 2019 17:20:31 -0500 Received: by mail-wr1-f66.google.com with SMTP id a15so6322828wrf.9 for ; Thu, 21 Nov 2019 14:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Io767/v87hev8kDmfnmz3wDTZyj8vs5Whnbhh5IghDc=; b=bDXSuBK25NTf7GrprTGTHCCKlfrp4FPP8mT1VvvtmVJYN2WbKvDzJGIPWss02ZWudl 5zo3Y2WXZYCf8BpXIljxGIwtTWRSBEfu+bsTDKVBn703zRUOSvhgUIg/9iCKjeVBrVxO B5u81Eahy2WUgCu1f/J9GrkpcigsXqzEyr6QCfylWr3kwMCei7AOqScD59lr/Z/JogN+ QI91inDsH5ZOqUaMepay5sYZxRUvatHMQ1MS0QAIh1JzCvHjBCUkrn1Y7zP0QHnMJROE PdYUhofmJ70h4QQ8gyMQKPnzqrQr9Il0YK5fSHAxNF67cd5v2Kw43sQA0S16hMtJPCCO qFLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Io767/v87hev8kDmfnmz3wDTZyj8vs5Whnbhh5IghDc=; b=Uy9vvL8S3Owy7fTHE24wEGQBz/BvQoaLHLeajJcRe1uyRXV/xmERx7ncJl5cL2iSyF DFK1roeQ2opm6Ii/MEVq5m5Cp9QQOMk3/bp93QNQO5eUgTPmVFgvmadYb4qReeASJJSv 9r6LNkar8dGcJZfujdWPQ9R2P4v8xonn996p8Ji99Hm6v8/F9UIA0Q690ThYWc89dQxh GsCFNWaw7FZKV6rqKjy9XhVHGruhNCuzS3LMe4wJpa+MC70MDv0MUlhb0i7ndkVr1bss EzxfQLCdVjoYIG6CUX7nL+cjzS8nB63aJuMKH2wsf6bU1I6BVqw0mTKw1ygx3rl37joi vMwQ== X-Gm-Message-State: APjAAAVgUOR04ztzRutZs5RQcwZsZROWlu7/YDhP0Yso9PInOY/4cbxI Su5G5Aua+mPMkqGvIkJ3CqatpECU X-Google-Smtp-Source: APXvYqw0Iuyr4qjqNnWDIeEmHhEwWbdFuHKp9OjoxwSEAjqGcDlInFS9CIEjiaYLLdeCbQZTvWf/fQ== X-Received: by 2002:adf:ed4b:: with SMTP id u11mr13160407wro.215.1574374829440; Thu, 21 Nov 2019 14:20:29 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x8sm5100685wrm.7.2019.11.21.14.20.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:29 -0800 (PST) Message-Id: In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:18 +0000 Subject: [PATCH 03/11] t1301-shared-repo.sh: disable FSMONITOR Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee Signed-off-by: Derrick Stolee --- t/t1301-shared-repo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index 2dc853d1be..665ade0cf2 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -128,6 +128,7 @@ test_expect_success POSIXPERM 'git reflog expire honors core.sharedRepository' ' ' test_expect_success POSIXPERM 'forced modes' ' + GIT_TEST_FSMONITOR="" && mkdir -p templates/hooks && echo update-server-info >templates/hooks/post-update && chmod +x templates/hooks/post-update && From patchwork Thu Nov 21 22:20:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257009 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 CE9A218B8 for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A5729206CB for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hRP0RuBc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726716AbfKUWUc (ORCPT ); Thu, 21 Nov 2019 17:20:32 -0500 Received: from mail-wr1-f52.google.com ([209.85.221.52]:45706 "EHLO mail-wr1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726380AbfKUWUc (ORCPT ); Thu, 21 Nov 2019 17:20:32 -0500 Received: by mail-wr1-f52.google.com with SMTP id z10so6297341wrs.12 for ; Thu, 21 Nov 2019 14:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=QhdTjpNyLlaQTnceyP3CQGFetOmTYh2FYhesHNIX4gQ=; b=hRP0RuBcGyUmRvK/NxJuYeECO9/Tq13XBR8CERFSsYeOTi5h5FuTXUv25crI6zzpMw AUrfkzxHv5KlY3bGEdgkufYLiM41RkZCjBwIirLkWqfi2QuUdNA6hKmVuBGRfBMIDuGb Cot/hq+tGN2tDmu9zpSx0NGtojOwgUzLRX2riEXL78h1qPpdWmmVVSPN09NeAUp2qQno WM6zJtWkFpMJBTt++X9ibrBJK+FCv7dcryuA6fz0cP+GBwlZ0L15rigSsA1yoqqv5Sly rHjvkbv+xUKOb9uoNFAT2bsQ6WoXckZCbQaG/xyCB4tSGfNXWal4LZjOofnG1dI0cPA9 2KcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=QhdTjpNyLlaQTnceyP3CQGFetOmTYh2FYhesHNIX4gQ=; b=HMy8cX+EGpYgbpxmTxfuUwSDShYgj2IaL74YNZxHHc0f2TlS1NYjQfZyUAV2cZ1Med 9Tm/cGVvCuMxhNy0vaJZrcn2WfYzL6VDkUbbshwYiSHyBuBRA5pyBbSK3lf6N/8Y8MBl Fm/BGVKm/Z4EmqZBCCtRpdmQOyFvomtsBeDBALFpLcJY2GXsWOTA1i3g1BcaOVubC8zE gk930ABHj1NGoKOZbbtKhnXP7+NqBJvRH3+/1yCYGdtaKSOfqAUNHj4+9puraAza3T9M 4IhB6cLCi/uNR6Pt5CKEMFIkJGFg6BPfJ50LFHOOchAg9EVvL+S6UbWM5ioUXHEfK0fN aPsg== X-Gm-Message-State: APjAAAXH9k1cW3i8EuhMMdieHxdYs25gGFGx2yjlUakvWI07GZg37CrD /poF6MhMCXbVbRai03TZL76sQjMD X-Google-Smtp-Source: APXvYqyrx+8JZvpguqSCWaEuFoqRNcRWC9vIBFYus+z2Czkr+etyzpI/4aVuQEkFVtYS0T6h4nIlVg== X-Received: by 2002:a5d:4142:: with SMTP id c2mr14145008wrq.60.1574374830053; Thu, 21 Nov 2019 14:20:30 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d7sm5141191wrx.11.2019.11.21.14.20.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:29 -0800 (PST) Message-Id: <91797769825438318d243b4dfddd6784b733fe4d.1574374826.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:19 +0000 Subject: [PATCH 04/11] t1510-repo-setup.sh: disable fsmonitor if no .git dir Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee Signed-off-by: Derrick Stolee --- t/t1510-repo-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh index 9974457f56..28dce0c26f 100755 --- a/t/t1510-repo-setup.sh +++ b/t/t1510-repo-setup.sh @@ -775,6 +775,7 @@ test_expect_success '#29: setup' ' setup_repo 29 non-existent gitfile true && mkdir -p 29/sub/sub 29/wt/sub && ( + GIT_TEST_FSMONITOR="" && cd 29 && GIT_WORK_TREE="$here/29" && export GIT_WORK_TREE && From patchwork Thu Nov 21 22:20:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257011 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 0AF18188B for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D674A206CB for ; Thu, 21 Nov 2019 22:20:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tCHbm3e1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726735AbfKUWUd (ORCPT ); Thu, 21 Nov 2019 17:20:33 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:42829 "EHLO mail-wr1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbfKUWUc (ORCPT ); Thu, 21 Nov 2019 17:20:32 -0500 Received: by mail-wr1-f48.google.com with SMTP id a15so6322879wrf.9 for ; Thu, 21 Nov 2019 14:20:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=I29Vp7df1EIlBApM6eCI7K/dFZdRBtrCCgS97gMiTcM=; b=tCHbm3e1SZgOmkBtH6KsXX45XOsA4juNlhqgFDvX+zDGHW4g8rxUlSvCu9ixs5uPip I1M9kEdKoz4AKlTeoZhJ8oJkoVwsQhhCSKSvcjteptR5M9E2FI3cDbz1uQTnNX0FGyut IVwn4pc+ZEhdYl99R+3Lwh3H163aVzMgv4j0C6pL9mzBcSTe/A2RKgR4N2z7JB3TvyCi kT4LR999jYCrQh77muidnFlfL6gjPLeRRP3gZBCCd6oin1mwrIHssfGEvvS4gcU28eJj CDNL/94iFwRaSiM/7N/HCCTPEdmknZRdR4lDTvJ7yWYxik/YN8SvQMjv3ulMllJnRsSG PDGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=I29Vp7df1EIlBApM6eCI7K/dFZdRBtrCCgS97gMiTcM=; b=fHALspgQMOKNW9zBw01sHAYXCcOfMye5kpsUsFd4LN6uE71PliA0JZKKq6/TOAsRKY /DFmUkGkm1CRU1KbcOn+70KKg3yPIPpEH10C6EK75XqW2JNWCZSkY3hITJRYzKaCp8OP drahMLpXLAaCAIJMESXYme34G4je/35DIO2IyRRevndEbfg8ac/xKdzUMfawV2vOcje8 n+60WaFKUyBjUt7MZ4S9W1m6iFr7PWGiv2bB07Osk0BK88x1aNpgk5HDiz+pdU6J8fG/ 1I3JWbVXXzlW2I3vCdfg/dPokdGSfSiW3DfVyroW0HrAsdbIIsXeI+shR52pawUuMc4m bwFg== X-Gm-Message-State: APjAAAVXEAetY06CNagep0Qjixgq7jDUPdEa/3RUST33eA2b6d+wgzQa CEnI/Y9YVARYZ+ASMoBr8isJNfYp X-Google-Smtp-Source: APXvYqzYnPqn7aMJfRxP3Mo/PHotGcQ5Dr880Piu1hjKN8ViDigFCkgs7iFbE65jJ5NwyKcYiYaGtg== X-Received: by 2002:adf:e2c1:: with SMTP id d1mr3632858wrj.130.1574374830732; Thu, 21 Nov 2019 14:20:30 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u18sm4976187wrp.14.2019.11.21.14.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:30 -0800 (PST) Message-Id: <81c587651e31d157c37c813650788bd5b88a9433.1574374826.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:20 +0000 Subject: [PATCH 05/11] fsmonitor: disable fsmonitor with worktrees Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee Signed-off-by: Derrick Stolee --- t/t2400-worktree-add.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh index e819ba741e..d4d3cbae0f 100755 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@ -1,5 +1,7 @@ #!/bin/sh +GIT_TEST_FSMONITOR="" + test_description='test git worktree add' . ./test-lib.sh From patchwork Thu Nov 21 22:20:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257013 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 325EC930 for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13BFA206CB for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CnTHOmwJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726762AbfKUWUd (ORCPT ); Thu, 21 Nov 2019 17:20:33 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33464 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbfKUWUd (ORCPT ); Thu, 21 Nov 2019 17:20:33 -0500 Received: by mail-wr1-f65.google.com with SMTP id w9so6403214wrr.0 for ; Thu, 21 Nov 2019 14:20:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=PDRBuiN4uuj2Oic+P/eMcdaZg/8GJEflnfYq6+i3Ww8=; b=CnTHOmwJnuJ6an3bDHdMI60bufvpyKto+kq+hzvRBU8+lJGGe+TrRHwvT9wu4Mu2gY M0ZqwwCtLYb9jRgZFQhVoGWnr6igplWKsbhrED53B3FyBDIzGS8mTjs5VOY3/tnhSgZe bCqZAiBiTUk/YRYa3w6ziBOcAtoqYY2sXF6wQMOr/MrDQqeT4nfJMn4FI5RUyOJsMMje BMuFoB3q98cC/HBw4BhAiLEysJHA/vPw6l7i2Co0fJT/dE++dSz6rRkimuB4hz9oWxFm JuZa91HzxfXtWTu7aF4TWp6iu8xMtlJw0znu+Sw29S8HPiuiVyWyHpv2k5t+DO1uqGLJ JZVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=PDRBuiN4uuj2Oic+P/eMcdaZg/8GJEflnfYq6+i3Ww8=; b=AIeDWORQOKC79GXZYWOZvksvDgoMaX0FaxMTM1/DuzmVM9pGoK+T3FQLUPj8HdmMG4 nOgpBeqlCgNSjHIgS7o0thrLuOubokcurE1sZD1qJksjXX5b9F3Pm35YRe8mYUdweR7g 315kmUFh3sqlqJUlir387og8myxwA/mm5eU7MJ7IxSX69lQ24UncGN6fSgVIfpEikqZX C7Rwsuf6PRlIRZuyPedefXmR3XqK4AYUD8DQYnCCTSHNJWQqtlh+hYsSKFU+rs2IRgg4 pYetNtrIFG/3XoMbHpQMVJcCn0fNJTAY0RgFJvm35nozjJTiN1uIfppvyM4QutP1dIcZ 6DVg== X-Gm-Message-State: APjAAAXJGoAf9IW+Vyw7AqZUR4M5GiM3La1CK3zeBo9lYI3jRsLWRBb1 92yLOqrGzfSfl+b0oNvaaS5kDJpA X-Google-Smtp-Source: APXvYqySfT/1qYmA/kKqVE5SzqlXxs0T2Zkz58ml8oMa41TfQFNyz3GbJ5Mc9tuUM+YwBrfdH96UQw== X-Received: by 2002:a5d:4ecd:: with SMTP id s13mr14440390wrv.216.1574374831301; Thu, 21 Nov 2019 14:20:31 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v9sm4645244wrs.95.2019.11.21.14.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:30 -0800 (PST) Message-Id: In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:21 +0000 Subject: [PATCH 06/11] t3030-merge-recursive.sh: disable fsmonitor when tweaking GIT_WORK_TREE Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee Signed-off-by: Derrick Stolee --- t/t3030-merge-recursive.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index ff641b348a..62f645d639 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -520,6 +520,7 @@ test_expect_success 'reset and bind merge' ' test_expect_success 'merge-recursive w/ empty work tree - ours has rename' ' ( + GIT_TEST_FSMONITOR="" && GIT_WORK_TREE="$PWD/ours-has-rename-work" && export GIT_WORK_TREE && GIT_INDEX_FILE="$PWD/ours-has-rename-index" && @@ -545,6 +546,7 @@ test_expect_success 'merge-recursive w/ empty work tree - ours has rename' ' test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' ' ( + GIT_TEST_FSMONITOR="" && GIT_WORK_TREE="$PWD/theirs-has-rename-work" && export GIT_WORK_TREE && GIT_INDEX_FILE="$PWD/theirs-has-rename-index" && From patchwork Thu Nov 21 22:20:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257015 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 6B50C14DB for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DB07206DA for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n3b0QIli" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726774AbfKUWUe (ORCPT ); Thu, 21 Nov 2019 17:20:34 -0500 Received: from mail-wr1-f51.google.com ([209.85.221.51]:44015 "EHLO mail-wr1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726714AbfKUWUd (ORCPT ); Thu, 21 Nov 2019 17:20:33 -0500 Received: by mail-wr1-f51.google.com with SMTP id n1so6308748wra.10 for ; Thu, 21 Nov 2019 14:20:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=jN9AdLNvViEOBxV6KrBx7VuvMursJPNapfugey/ZdMc=; b=n3b0QIli8NWPi+ITywR2MmXQuIiJ1ebtzMP32u0vps5oSuXKwW1VB0vYmbOamDgCN1 g8c8S6CRywQJsD34qMw/VG6VC1hdDuX0GiiwGRrbfRB9J1eb6d0kiry2KX2mGldClfvk JSISrj/Pa/l82l2IU5aUWwwP82GxniRMbGhGP2HkWYam47+WWkhH/jWB7UvQIFvfkKTW jU1aluCe2qKmVZlnm49DTTe88MTMeel5Mj4lIRbwSxqbKiLy+2M3s7jxld00giRKQWa5 qG97p3A982PjBxKJjGIBDDA4p8BwZmP91Z9z9uSarOQonRUnLBsyoZV+SlBdj1235DfO b9eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=jN9AdLNvViEOBxV6KrBx7VuvMursJPNapfugey/ZdMc=; b=NKB2XdvXRNNAR6172w8tpdNmBoR7/mi34oM2e/GTxdB2L2JXvO/ew+qpdzixWCkDiT uDKnprARRgvxI5x6fCinrskQyMTalFFadnnFrlkOhobGQy4Ot9ZSlaCKLvw9Os91RPRk 9nYW1C3xyW0t0Q2UePogsq9fH/HKr+UkdJ1gwIlInRCw3J7Gcik3zrka3/WN9tr0s0Oz SHVuOCpJJCLmaCfgPb6ggBvsFA1vb8fjKA1vmS715Pj8OpY5auwfHGHk3rr7aMOHw303 EEgPBeRFLaueT+J21o+8O3uk7GJo84nT3qIu9ItdGIszI9wcDT7psPFFKHt1JJFkl+Us obxQ== X-Gm-Message-State: APjAAAVSRhQyIJOL7fWZx1MESuamTAcn+WrLBEKKVwEucrWbEMSCbtqx gmGnziA+Dsv5wBe+oXNds7cebZJJ X-Google-Smtp-Source: APXvYqyH9ZvWLzzEu03DCIrc1vZ/kw7Okf5iEZgVE7grQ3zuXhXuG1e2j+USlR8VEIpyd1u+Okitwg== X-Received: by 2002:adf:f80b:: with SMTP id s11mr6444340wrp.12.1574374831917; Thu, 21 Nov 2019 14:20:31 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g184sm1276505wma.8.2019.11.21.14.20.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:31 -0800 (PST) Message-Id: In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:22 +0000 Subject: [PATCH 07/11] t3600-rm.sh: disable fsmonitor when deleting populated submodule Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee Signed-off-by: Derrick Stolee --- t/t3600-rm.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 66282a720e..64269bd89d 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -355,6 +355,7 @@ test_expect_success 'rm succeeds when given a directory with a trailing /' ' ' test_expect_success 'rm of a populated submodule with different HEAD fails unless forced' ' + GIT_TEST_FSMONITOR="" && git reset --hard && git submodule update && git -C submod checkout HEAD^ && From patchwork Thu Nov 21 22:20:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257017 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 8DE77112B for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EDA3206CB for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aMXJyAKL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726784AbfKUWUf (ORCPT ); Thu, 21 Nov 2019 17:20:35 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39700 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbfKUWUe (ORCPT ); Thu, 21 Nov 2019 17:20:34 -0500 Received: by mail-wr1-f68.google.com with SMTP id y11so3240076wrt.6 for ; Thu, 21 Nov 2019 14:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=oCa1UKZozp2r7iMnBdi8J69hzu+2k+Oplcwfdq+fCFs=; b=aMXJyAKLmV1J5msB26LvX3k3px4SRc6bOlt5ycl+F6ovkG5A6A+mXb3QMUD41IwoqC 7J8Lq/UwwYyacFcv1UU5PdJqiFUlXDbXul1lvQkq10B4MkLZqgSXBjVNX4C5jdNePQi6 rE7qTl+nfzgAoFeZcEDW/NO7qIzEc1F2c22PMG3sXv4z1DC4n/ZZnTUjCUxT6ouHDka1 tX0GW11HRCl7AVKW9rwADZ9ORKrl+RBErFrptBNtm3MmJuLWsO7T83nZxV4DLbdqbg1G 3S/yWQBEgwY93aOQIgDDrhZgFEhSsZXDJqvNSC6MlqpsER/T/NOcHn1F/dnwlAXSlzW6 eJaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=oCa1UKZozp2r7iMnBdi8J69hzu+2k+Oplcwfdq+fCFs=; b=JxrM8jFOjD1wPnsQoMNlRaJbEVwEWmwpp3mc6e2p54ZfKos7S0OOskzNHrjERLOvsN CPr0WW2Of5jW0h60Tqya8xpnTz1LNpOW4q4EOhuWm+mRMKOHQR1Sw2CZYlS6vkvqGc90 2RgljWeLTQY1VnaeJptOM19CQ8Rnl4WGuIHT7c+bOwZioaDzygESwoAIeN9il7qlhl1D Izmx5F+afo2076RlM4cJWUoQc1OY9GoUSUm1DpC0tTmmAwAjVfFIAefS2rkIytjnKlpx Cld+uHEr4vEWoWI18VjelvBdWBQcTk7AKJ0uuI7vMLnU0N1PtRb8H439poiqKhEAxZag 7MFw== X-Gm-Message-State: APjAAAXhxCGidtCFaQFsgvUzCPmxafWuCBaE2ehmzhmIwJVXTonZgFT1 UjpXpLl/hDvbrFNd6ucjZyMhSTCy X-Google-Smtp-Source: APXvYqy1aqAPklwQ7DLXWRWlh6yMejypT7g+XoQOgWYCwKWDVN8S9woFKIWrK1Jp7IH4prqd/aQIVg== X-Received: by 2002:a5d:574d:: with SMTP id q13mr14780541wrw.263.1574374832508; Thu, 21 Nov 2019 14:20:32 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u203sm1182830wme.34.2019.11.21.14.20.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:32 -0800 (PST) Message-Id: <36f845cb7ee21443e7f20517968982222e775a6a.1574374826.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:23 +0000 Subject: [PATCH 08/11] tests: disable fsmonitor in submodule tests Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee The fsmonitor feature struggles with submodules. Disable the GIT_TEST_FSMONITOR environment variable before running tests with a lot of submodule interactions. Signed-off-by: Derrick Stolee --- t/t4060-diff-submodule-option-diff-format.sh | 3 +++ t/t5526-fetch-submodules.sh | 2 ++ t/t7402-submodule-rebase.sh | 3 +++ t/t7406-submodule-update.sh | 2 ++ t/t7506-status-submodule.sh | 3 +++ t/t7508-status.sh | 3 +++ 6 files changed, 16 insertions(+) diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh index 9dcb69df5c..017417790e 100755 --- a/t/t4060-diff-submodule-option-diff-format.sh +++ b/t/t4060-diff-submodule-option-diff-format.sh @@ -15,6 +15,9 @@ This test tries to verify the sanity of --submodule=diff option of git diff. # Tested non-UTF-8 encoding test_encoding="ISO8859-1" +# fsmonitor does not work well with submodules +GIT_TEST_FSMONITOR="" + # String "added" in German (translated with Google Translate), encoded in UTF-8, # used in sample commit log messages in add_file() function below. added=$(printf "hinzugef\303\274gt") diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 63205dfdf9..fb346bff05 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -1,6 +1,8 @@ #!/bin/sh # Copyright (c) 2010, Jens Lehmann +GIT_TEST_FSMONITOR="" + test_description='Recursive "git fetch" for submodules' . ./test-lib.sh diff --git a/t/t7402-submodule-rebase.sh b/t/t7402-submodule-rebase.sh index 8e32f19007..c78e9009cf 100755 --- a/t/t7402-submodule-rebase.sh +++ b/t/t7402-submodule-rebase.sh @@ -7,6 +7,9 @@ test_description='Test rebasing, stashing, etc. with submodules' . ./test-lib.sh +# fsmonitor does not work well with submodules +GIT_TEST_FSMONITOR="" + test_expect_success setup ' echo file > file && diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index c973278300..8d93aaef5f 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -11,6 +11,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD. . ./test-lib.sh +# fsmonitor does not work well with submodules +GIT_TEST_FSMONITOR="" compare_head() { diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh index 08629a6e70..1a716f2c2a 100755 --- a/t/t7506-status-submodule.sh +++ b/t/t7506-status-submodule.sh @@ -4,6 +4,9 @@ test_description='git status for submodule' . ./test-lib.sh +# fsmonitor does not work well with submodules +GIT_TEST_FSMONITOR="" + test_create_repo_with_commit () { test_create_repo "$1" && ( diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 4e676cdce8..bf0487632d 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -846,6 +846,9 @@ test_expect_success 'status refreshes the index' ' test_cmp expect output ' +# fsmonitor does not work well with submodules +GIT_TEST_FSMONITOR="" + test_expect_success 'setup status submodule summary' ' test_create_repo sm && ( cd sm && From patchwork Thu Nov 21 22:20:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257019 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 B7BA11871 for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 963C4206CB for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fT4ZADU1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726802AbfKUWUf (ORCPT ); Thu, 21 Nov 2019 17:20:35 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40524 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbfKUWUf (ORCPT ); Thu, 21 Nov 2019 17:20:35 -0500 Received: by mail-wr1-f67.google.com with SMTP id 4so3023563wro.7 for ; Thu, 21 Nov 2019 14:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=SSk2c0GZIeKhzrboplrlbr89TjCddJrfGqCdlxfV+pU=; b=fT4ZADU15k5fIdiT8fpFZhv+iXzuEqHi4uHKoIo4kCB0kqGMOC0y5r267RIxJtcH8N UZD/kn9HWVKZBv18VcIo8Qy29A3y/I02N37eJNGNgAc53V4dyQU5KOJkuPcAjlJMMHPr lZJagUiV1DDzoPykrYVUReXURVeA/DJ4kz6uiokyGwQi6dG0X1jdnIBS0qS1RG53cYNh vPMUGfaFu8ANtXsRXkaGPe9FfoakoOuhF3DOHlT9hr4CSY4k78nO6WRsjjhljR5AViuy 2zDZz2LnCSwIBsndjOxZNYrgIrRkeaNQscCc3eYCgq8Be39Lzoe5kzGWt4AuvD4/yvER 3QIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=SSk2c0GZIeKhzrboplrlbr89TjCddJrfGqCdlxfV+pU=; b=uPfBSH1FSd1rHJgwtsVXNbPquqFLxhB0eIGWx2qlefm7tSZTgTpbona0uWYVoKZPjB ho/o7lnDurBEFCJG5h8TPcTUfjnOi7Oa6yb5WvACHodtLw3yu03kqk/iAZPoYzLb9Ve2 lLI1y3o+nggz0v4MWPDTozvXMVx4vtBGswVOz7wpoLQbUP4Alo6zErgj5OOmwK90alfa 71G9HRxwLiWRfAsQmsuUDrdw5lz97N1SLU5n6b/ze29PCNDMzHSj8cwvdIP8HIa5iSah hEq0jMao6ZH3ly9URc2Vy/RWEwOqYyiAZCtGqnTZxt7ljpabDPgKDoiZ5r566YsfoZOu HLfA== X-Gm-Message-State: APjAAAUdH8wI+OyRtHnEMNE1MIbeLIPX94Mv8KieNReWyUcqsa9AUMBX NNeX1e8o8W8uKkbiZsmCQMm+cQNO X-Google-Smtp-Source: APXvYqx9qk0jVVLQ0qDJFvTLLmaUpmHmy732rFqjCdc0p4K5UA9fBFTCta5jagP3FfhaCTF1xZGyeA== X-Received: by 2002:adf:ec84:: with SMTP id z4mr5595110wrn.289.1574374833184; Thu, 21 Nov 2019 14:20:33 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y6sm4720189wrr.19.2019.11.21.14.20.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:32 -0800 (PST) Message-Id: <141a1909a44af1dc6a1bead323ebb0ce5842403f.1574374826.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:24 +0000 Subject: [PATCH 09/11] t7063: disable fsmonitor with status cache Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee The status cache tests use GIT_TRACE_UNTRACKED_STATS to check very detailed statistics related to how much Git actually checked for untracked files. The fsmonitor feature changes the expected behavior here, so disable the GIT_TEST_FSMONITOR environment variable. Signed-off-by: Derrick Stolee --- t/t7063-status-untracked-cache.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 190ae149cf..c433738a3a 100755 --- a/t/t7063-status-untracked-cache.sh +++ b/t/t7063-status-untracked-cache.sh @@ -4,6 +4,9 @@ test_description='test untracked cache' . ./test-lib.sh +# fsmonitor changes the expected behvaior of GIT_TRACE_UNTRACKED_STATS +GIT_TEST_FSMONITOR="" + # On some filesystems (e.g. FreeBSD's ext2 and ufs) directory mtime # is updated lazily after contents in the directory changes, which # forces the untracked cache code to take the slow path. A test From patchwork Thu Nov 21 22:20:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257021 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 DF082188B for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD9D8206CB for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="acBDAguT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726822AbfKUWUh (ORCPT ); Thu, 21 Nov 2019 17:20:37 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40524 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726714AbfKUWUf (ORCPT ); Thu, 21 Nov 2019 17:20:35 -0500 Received: by mail-wr1-f66.google.com with SMTP id 4so3023584wro.7 for ; Thu, 21 Nov 2019 14:20:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Aw86E2JesYnBke1UD3Cn25oDyN4i0P0DvTe/Iw1CwQU=; b=acBDAguT8htPZkEpF7JO8OKVmqlb5FIiFfIZsRJ7uNsl8xF3Yzij2fgTQjNoegxggd ajvO9npDLVledwoLqrDHcew17xX2HEhPl31su4hjvoK5zli5vGpk5W3wex0RJiSs39ZD O+qmbcsXTj9WLpsPLrr1Fk4t8yhv0s7ApM1/NGPUVcYqwSp6fJJzx+C5pHapV7FK7dDH 8VtQydBGcXd6FpvGt/+8VOQGQJj9PD5zSddTCRm+DyNLbLFXku7p/asKLGCFeF9iwq0x RMmMuWvZeBc75T+ZE+KlL6dVdfRCTgfTqyWfBBaf/T6IQzarmlK/bNE0k+zZa3bKTveU tk7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Aw86E2JesYnBke1UD3Cn25oDyN4i0P0DvTe/Iw1CwQU=; b=aWtxiQTMLuKyRh/CY9zKJ9tm88CfLX9fyp+aJ5jpbruHL9HuRvQmsAymB4ApGExWpo lsX849vXT2iC6mDWT/7AEeitoBjGxEYUTup+GKGsbR8pUtY/3zUJxWp7UyZj9CFpLK67 HrkEg0462Yfnd824RYDwgu0Vvv1r8u8JsbMObnyxca+GLT0hP9i+tMqYfgXVmaWbKVGn XzBE1cDMtEf/CwLbWhDys961qQPb2V9bofgxIA1rhsbcyiY3DWWsj8RlBAHeFT+e27Ok nwvcZc3gOMlK24klLyAeJ2WUNRBS5eo5uMFRCjn7TxPhqek56g3ARQ3xJamSmMWLelgq 7E8w== X-Gm-Message-State: APjAAAVAXQ+8jtxIUWjkyNFuyifyeqJRmce5CCSjxzvuMlocR7GfAx7/ GhCa7/EUOD5lfCsmy4JU7HEWsklr X-Google-Smtp-Source: APXvYqyE7m5cvAKv1a7DjvstlBfJqD0ZuBInC9yt81g3OZRLkl0pwz5UmZRfA5BdHLyGlLPdpdnbqQ== X-Received: by 2002:adf:db4e:: with SMTP id f14mr13354997wrj.257.1574374833802; Thu, 21 Nov 2019 14:20:33 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c15sm5430914wrx.78.2019.11.21.14.20.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:33 -0800 (PST) Message-Id: In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:25 +0000 Subject: [PATCH 10/11] t7519: disable external GIT_TEST_FSMONITOR variable Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee The GIT_TEST_FSMONITOR variable was created specifically so the t7519-status-fsmonitor.sh test script could tweak the expected behavior depending on its value. However, if we set it externally to use the Watchman integration, then it breaks the initial tests that demonstrate behavior _without_ the fsmonitor feature. Disable this variable at the start of the script. Signed-off-by: Derrick Stolee --- t/t7519-status-fsmonitor.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index 81a375fa0f..443d2e653b 100755 --- a/t/t7519-status-fsmonitor.sh +++ b/t/t7519-status-fsmonitor.sh @@ -8,6 +8,9 @@ test_description='git status with file system watcher' # "git update-index --fsmonitor" can be used to get the extension written # before testing the results. +# Disable an external value, as we will set it directly as needed. +GIT_TEST_FSMONITOR="" + clean_repo () { git reset --hard HEAD && git clean -fd From patchwork Thu Nov 21 22:20:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11257023 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 0F96C18B8 for ; Thu, 21 Nov 2019 22:20:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5091206CB for ; Thu, 21 Nov 2019 22:20:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dsjV1q8R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726830AbfKUWUi (ORCPT ); Thu, 21 Nov 2019 17:20:38 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:44379 "EHLO mail-wr1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbfKUWUh (ORCPT ); Thu, 21 Nov 2019 17:20:37 -0500 Received: by mail-wr1-f48.google.com with SMTP id i12so6292016wrn.11 for ; Thu, 21 Nov 2019 14:20:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=FeMle/vvKHKWFJvUQ6wmKMyy52PVuexwsHeVnliddmo=; b=dsjV1q8RsfhW5Fy9NsDf1x2y9gOsy/BfTlo+RJcRXkM2zrS4NVJjPsaYqwN4WySUnS wsHEET3VQDu3ySLlDehglnPF+Spi/NNZH4zAD5hsss+kRrR0s5c0AzAa7DV94EnWhYkF +nuPNQp1p5morov4+8HeByvUzjnUuqyOiDOEE/0jJFlsDUeVU368QXemO9nIfmqPk3oX U+Ae0pXdkrLOKT0Rjw/XfujBFxojdCryQVi1FuNUn5c6lJWobweOBAIwJQtytg0GLnQg DkMwdHD9+L76ttf7J5wsMwG2x1FgfeSz88TQxsrdD75oZBMPh6ThD9mbdXivwJYEud8m vAqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=FeMle/vvKHKWFJvUQ6wmKMyy52PVuexwsHeVnliddmo=; b=FynF680gm1cRtbu6ZJ7R5g9k7zcc9xtDCNTMEU2h0Urdkuao9k3QZiYAFUZk1k0ocy OFUxRPYs3cImG9dYf3j9wc+pRQ0XZBy81s7u+Nr0FPBJ5kFJuHPHxWMIJgu2GtA4IiOf W4nru3ru8cwE9OkZ/yV72dpWomf5VAuxofc1MPuYXPxR3dM5O9uzVstdtGG+urlp5SYn zBOsvA7GFrfY7l+P8b636a+7cgrVo28ICmh2EaxlFeYsJqVienHLei1KYInx4xMvwNoX s8freFBhRgboPZPoLJF88ZHloUAOhv9nHapn1YE7p2BknopwsM8gtXd0bjp+KM6JG3Uh IYbg== X-Gm-Message-State: APjAAAVbkn/hsiLyHsLeDilJ6+QU0yZtKdj/N0ALtL2eASrVRi1J7qVL H+C/DVo19ZxmrvLdJk618zd28Mvk X-Google-Smtp-Source: APXvYqwwNdh+6Zj9+Vw3fViRDLut8rbZq34Qt1cy5L0+wzLT9MrIjbgvDIcS3Ma2E1dcsBxRplqYog== X-Received: by 2002:adf:ed4e:: with SMTP id u14mr14261796wro.132.1574374834512; Thu, 21 Nov 2019 14:20:34 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v184sm1228955wme.31.2019.11.21.14.20.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 14:20:34 -0800 (PST) Message-Id: <47cecb4a83a3f726088ffba0b00679384c7349ae.1574374826.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 22:20:26 +0000 Subject: [PATCH 11/11] test-lib: clear watchman watches at test completion Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee Signed-off-by: Derrick Stolee --- t/test-lib-functions.sh | 15 +++++++++++++++ t/test-lib.sh | 2 ++ 2 files changed, 17 insertions(+) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index e0b3f28d3a..03573caf42 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1475,3 +1475,18 @@ test_set_port () { port=$(($port + ${GIT_TEST_STRESS_JOB_NR:-0})) eval $var=$port } + +test_clear_watchman () { + if test $GIT_TEST_FSMONITOR -ne "" + then + watchman watch-list | + grep "$TRASH_DIRECTORY" | + sed "s/\t\"//g" | + sed "s/\",//g" >repo-list + + for repo in $(cat repo-list) + do + watchman watch-del "$repo" + done + fi +} diff --git a/t/test-lib.sh b/t/test-lib.sh index 30b07e310f..067a432ea5 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1072,6 +1072,8 @@ test_atexit_handler () { # sure that the registered cleanup commands are run only once. test : != "$test_atexit_cleanup" || return 0 + test_clear_watchman + setup_malloc_check test_eval_ "$test_atexit_cleanup" test_atexit_cleanup=: