From patchwork Sat Mar 28 14:48:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11463569 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 94F2E161F for ; Sat, 28 Mar 2020 14:48:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6504C206F2 for ; Sat, 28 Mar 2020 14:48:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=web.de header.i=@web.de header.b="YhthKENG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726445AbgC1Oso (ORCPT ); Sat, 28 Mar 2020 10:48:44 -0400 Received: from mout.web.de ([212.227.15.14]:34829 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726045AbgC1Oso (ORCPT ); Sat, 28 Mar 2020 10:48:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1585406916; bh=B8cWtIDPUMvb8P3b/iUgIefkEITtimYR4Y2reTDFCI8=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=YhthKENGBpKy5y+iPwIrDZAPSvLukZEsjPR9AskFMvqhuIj7xATZWf+eHyePKqjdk EAk2jeDkg2r/Yiwc9RvAvzyKFBw/w4fIbIAWus/1PJ1r3vCcepDvpsJaEdmU35JV8N 8oqhA7Scwux4XOx0S64g6O8vAjrqg5K1v1QMTYEE= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.26] ([79.203.21.89]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MVLY6-1ijTw21QTO-00Yk9N; Sat, 28 Mar 2020 15:48:36 +0100 Subject: [PATCH 2/1] pull: remove --update-head-ok from documentation From: =?utf-8?q?Ren=C3=A9_Scharfe?= To: git@vger.kernel.org Cc: =?utf-8?b?5aSp5Yeg?= , =?utf-8?b?Tmd1eeG7hW4gVGg=?= =?utf-8?b?w6FpIE5n4buNYyBEdXk=?= , Dongcan Jiang , Junio C Hamano References: Message-ID: Date: Sat, 28 Mar 2020 15:48:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:f5jAcKArpOFlkbRCwVsh5DgUNooNEJY66KY9yoEOmFsd2Y4GYd+ YtliS6dqoqPK0U04kL4Q23j+VuM5Di9djoELHb65DIp+Vmduej4I/AMM/Pq2Aq+v65D1qog u5kU4nDMBpEY1I/d9W/khVV35D9l/+FIYAvpbGzkYruVR/PPs2Y3+3a2X6jRc8t0T1buXaf /quIJovkPQjUdgFvhFpHw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:m3TbW2zbOIk=:TZzqHyk0l/dUnwTnSykOTr /sWxG9HBS/HHDadzKUqh8T2Hn5Nkm0ZMyXbNUhJUsZvVtQ6gC3XDxj2r8LslvH5J7HemSsdRu 4JvNuhLOCJ/QzfM74aV3nM/u2LbvLlkkkltTKEgOtNbxLwuO273yaS3Vmg1NIDftKQAowRgHx 1afI9cPfQCaSMdbSsfR8zxbxLU8nDo1Fk1zyiTgQImyk6BVJ7KoTX/ck951lr5j+vVxPkBp2J ZEprTLE0VYD4OLg3+QBk5RtQ3IcyQx+JTqy2QUQHEfHtRLBRw+O7bGUnxS0zPuWt9kZsekyHz JT60qX9eBZxOoxCD7z4ajKhNpwDCjQuopeAe8Vvm+/6vTorSJNpV0mhXJPLRmi/tHTifB+dBa KWrp9Rnb0opFJ7+SCIkd9PDSIHin1c/TkvyuL3u9XZO2xZAPLhzTT93Rqrff/fJeN//O8wLkW 3XN5T87H2BCWCSpWKd42zIwynrK9hPPaevANVxZx/T4HitcQFrzFYP6HxG9JZrQaL3lZHLwbt UddK51v6gk12bAnw5TYgHlwJ1bwAPPK8ktIcWpK3lv6haGQsdnWOnLvwNx90B/ewc7wli7z0F NfKgURz808ukFL+Fb8p8510fXab22easzhxAxi6qp8ANLpMIP49seQsmR4SWa4mxn5rnRs2Oy twdkxK/uIYeKy2Kr5VFJDOxz4FhVfsjfCa4iB0gOilxNKHUf9kYU8W+yqj4+wkCP8zu0J8HEc DNVLXC/NRxbkUHyf9cLySinhCeRl5PxCNYn2Drd1iTD75nyUsms6WNGkBWFIvQIxmP9WZgmJh B/YdCAgsuNm5JrTm5WvsPGKehaV2iYFZQG0rODpq06qUZs/PXrtNb4iUC3U4hdiEcn/g9fH65 us40pqknOlEp5JxD/cgLAZtAcvJr2bfSpObUnCmenqNcjUN1Ih2jCVY0gyccugpdIffsCaoVu XbLkIQXkalKH2eEcwCrqES/lidi+0BqjAoeP2UTB1Rw+1woP/UrhyAZyDeIFPZI3J6hTk/8df JB1ImdSvA11ccaPWXBfWeLYiPcyq0Fjqmf75TqH0HtfBqtBasQ1an4Su4x+7olirg9c6+K2+6 84KmEF/Lzcx3RczB7pfcSzY28IOO3Dnn82iu2/rpHdiQuTRLplvwEv4N93Qd2V3e9o+vdjnkl Xdkbkf8wFlb5ulh7Cw6DXXwUTlNIwIW7vntTjrX0lv+C3GqKuCoy2rprh4gO5sajXAjj4P50B gYI2bFv2iB7OnBvuT Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 'git pull' implicitly passes --update-head-ok to 'git fetch', but doesn't itself accept that option from users. That makes sense, as it wouldn't work without the possibility to update HEAD. Remove the option from the command's documentation to match its actual behavior. Signed-off-by: René Scharfe --- Documentation/fetch-options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.26.0 diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 00d03ec8c3..05709f67a1 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -204,7 +204,6 @@ ifndef::git-pull[] recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly. -endif::git-pull[] -u:: --update-head-ok:: @@ -214,6 +213,7 @@ endif::git-pull[] to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it. +endif::git-pull[] --upload-pack :: When given, and the repository to fetch from is handled From patchwork Sat Mar 28 14:48:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11463571 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 8B3D992C for ; Sat, 28 Mar 2020 14:48:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69A3F20723 for ; Sat, 28 Mar 2020 14:48:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=web.de header.i=@web.de header.b="s5BQXPDp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726604AbgC1Osr (ORCPT ); Sat, 28 Mar 2020 10:48:47 -0400 Received: from mout.web.de ([212.227.15.14]:37757 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726045AbgC1Osr (ORCPT ); Sat, 28 Mar 2020 10:48:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1585406922; bh=OO9Qm0PEmhIBiaX12aitCqKUFgJseodn//RKIQd/QwU=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=s5BQXPDp2uezPrCJ0KbWJYba++jUiq6BuGb5iqurQBTVQCaKmCgzuz9tLS7SUYMYn CJl1zO9yyU3S6x2kahYZUXSI98AZIDZDTsZ5X1lrkwgehArbnNXRLtnKRKqnMFj9Bb C5Td1/hs+4z/VtheRw58kcL/jiG/5+yRmsXM8EAI= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.26] ([79.203.21.89]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LvSQV-1jQD4T0ZcZ-010df4; Sat, 28 Mar 2020 15:48:42 +0100 Subject: [PATCH 3/1] pull: pass documented fetch options on From: =?utf-8?q?Ren=C3=A9_Scharfe?= To: git@vger.kernel.org Cc: =?utf-8?b?5aSp5Yeg?= , =?utf-8?b?Tmd1eeG7hW4gVGg=?= =?utf-8?b?w6FpIE5n4buNYyBEdXk=?= , Dongcan Jiang , Junio C Hamano References: Message-ID: <631d4c1b-b3f8-bb55-129e-7285ca19fe09@web.de> Date: Sat, 28 Mar 2020 15:48:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:KrV+wsL6k/Q0jMh0vVDuHh4Sw/HXc/rHmFx8NCf59xQZSjQzG9y B/Iuys4zcbZfQQwLQkdRWBv6F+ixRQ2wMsOokO9qP+8OLW1Veekq8ILQCNzTD243yGNgGaY G1rpq2Nk2A/OobjqKU2nXnODwviIAJGGrRXxp7m5vaY4FuY8iB8ql/xVt+qGM9V+cwkrlIP 6D3GWqmO4L1q1CG+SJRBg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:BPHZzbfK1dA=:q49GH9X22mI1RP8aQrgfRT QjFHFSAU5Woc/OqyroJGfwlXwVDqa2jySPqliQFVYMzZUcZMWsATu+PNy783vGCfgMMLbvkQ8 r9SA4Dt0OUFk6KEMDF9/6y3XM3IA8qBexbLCjEqa/wSWyGhMz6SEj4dVHpiImtTECyZmCSlXe OWx0EIUzPxpIMn17hYW2wYs1BXuwVmoLfwrV1kV4vhLsWBP+aZFPcosX6Kxx60XE2/H5a1/23 dVAsxWrbvHd4uyq3U7pmzNy7cXIMLAbJlHz2NHgo4jJ7Sv5IVMV+EabR+pbxyIN6hTZ1caSPP /gh1VycNLaC7A/rJ3dhJYt1qIeZOfiGXwYw/CkYbllfUVqxvObTIO5v5E7sAoN2C9WPvaGVyR IE5m71lB1vHGUak02xqb0v85nBPGf9WOd7r7aR4Bp+mgTFejWFKT7dnnShgp7nrLBFF8SM549 BjrLUbtf44ePyEXcCstCZzwQxYLi0QzoPysHk1KdPnqfwAhibINZAlxZFF5+IPD5GvEAYgMvq zA+myXPkkvIaCeLd/nWDJe1c4lHm+0eN8EwqroK0xLU7I/v7Lrk8NQDAk0intRiy/od6seyjH CV/C2AvuTd0BR9KSBrneI9vV2mRWx5ZxLaE5D3er4xNWt7lyGy25jRSgVR8SR4fXcdJqEiWuB CdWWsRMiKKeAqn5h7ktSejW/F50D36mUstkIsDzFpu5G2UsAMVfXhV463NG8baeZDYhmLyV+4 hiEcfYNvllLazDyA2jap5h7XQAWuqArkSxHyEbzSWIs7WSquzCCMcEuk22BlUdAqNjIRmQx9j BtzkzIAhUYYG4AEMtbqEJXVSj5+Mjrmm5j/u5IwdbQfzR7N9f6O0YexUrl8A2xG6pm7tqJRlb ECTOgbHQzt6j0uyGQ7uzDpGkroOmw8a0HqVuQrw2aTM8Kabh8MbsbYjMq5hFdmenO6uvOLlmI IOWsB5SJr6D7RcS5+8/QIOuyHzNXEVwNhq2SVDrQrN5A3LqT4jfpSrd5EnBbMkG3rmdAzGk1Q 7OGT5xgirY/x5Qk7FF7XCpfRm5AfjMWT/6zj3TBf87dyOFMT692NW6Ae/4v9jK/rS4PisphCe Aw85LcoL6wnnvm9BOFwBQ1rhp/dGNlTuQE1XIRbdtCxpYER2sxCvTlV8se4OoCdf6jTxJDrF+ zq/DW77YE4YkzL9+6f9KryAKqOsUx/IhNUabR8flqWj+KFLxhBQ2AwUiKs/+aptJCbGy5ZWOk xTS1JDWjvyMjme/6r Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The fetch options --deepen, --negotiation-tip, --server-option, --shallow-exclude, and --shallow-since are documented for git pull as well, but are not actually accepted by that command. Pass them on to make the code match its documentation. Reported-by: 天几 Signed-off-by: René Scharfe --- builtin/pull.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.26.0 diff --git a/builtin/pull.c b/builtin/pull.c index e42665b681..880eb29852 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -110,6 +110,7 @@ static char *opt_ipv4; static char *opt_ipv6; static int opt_show_forced_updates = -1; static char *set_upstream; +static struct argv_array opt_fetch = ARGV_ARRAY_INIT; static struct option pull_options[] = { /* Shared options */ @@ -207,6 +208,15 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "depth", &opt_depth, N_("depth"), N_("deepen history of shallow clone"), 0), + OPT_PASSTHRU_ARGV(0, "shallow-since", &opt_fetch, N_("time"), + N_("deepen history of shallow repository based on time"), + 0), + OPT_PASSTHRU_ARGV(0, "shallow-exclude", &opt_fetch, N_("revision"), + N_("deepen history of shallow clone, excluding rev"), + 0), + OPT_PASSTHRU_ARGV(0, "deepen", &opt_fetch, N_("n"), + N_("deepen history of shallow clone"), + 0), OPT_PASSTHRU(0, "unshallow", &opt_unshallow, NULL, N_("convert to a complete repository"), PARSE_OPT_NONEG | PARSE_OPT_NOARG), @@ -216,12 +226,19 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"), N_("specify fetch refmap"), PARSE_OPT_NONEG), + OPT_PASSTHRU_ARGV('o', "server-option", &opt_fetch, + N_("server-specific"), + N_("option to transmit"), + 0), OPT_PASSTHRU('4', "ipv4", &opt_ipv4, NULL, N_("use IPv4 addresses only"), PARSE_OPT_NOARG), OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL, N_("use IPv6 addresses only"), PARSE_OPT_NOARG), + OPT_PASSTHRU_ARGV(0, "negotiation-tip", &opt_fetch, N_("revision"), + N_("report that we have only objects reachable from this object"), + 0), OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates, N_("check for forced-updates on all updated branches")), OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL, @@ -567,6 +584,7 @@ static int run_fetch(const char *repo, const char **refspecs) argv_array_push(&args, "--no-show-forced-updates"); if (set_upstream) argv_array_push(&args, set_upstream); + argv_array_pushv(&args, opt_fetch.argv); if (repo) { argv_array_push(&args, repo);