From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 739F92265A33A for ; Thu, 12 Apr 2018 02:55:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 24A0B113409; Thu, 12 Apr 2018 09:55:36 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-142.rdu2.redhat.com [10.10.120.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7646B10B00B6; Thu, 12 Apr 2018 09:55:35 +0000 (UTC) To: Long Qin , ting.ye@intel.com Cc: edk2-devel@lists.01.org References: <20180412030801.14216-1-qin.long@intel.com> <20180412030801.14216-2-qin.long@intel.com> From: Laszlo Ersek Message-ID: <4847c5f2-ec52-6ef5-0469-86f77c0f2dfb@redhat.com> Date: Thu, 12 Apr 2018 11:55:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180412030801.14216-2-qin.long@intel.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 12 Apr 2018 09:55:36 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 12 Apr 2018 09:55:36 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH v2 1/2] CryptoPkg/OpensslLib: Fix the documentation about submodule update X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2018 09:55:37 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hello Qin, On 04/12/18 05:08, Long Qin wrote: > This patch is to drop "--remote" option from the original suggested > submodule update command ("$ git submodule update --recursive > --remote") in HOWTO document. > > "--remote" option will integrate changes from the upstream subproject > with the submodules's "current HEAD", instead of using the edk2 > superproject's "recorded SHA-1". It is wrong here for the edk2 The commit message makes sense, and the patch is good, but I think there's a significant typo in the commit message. Namely, the word "wrong" is wrong :) Instead, it should be "important". Or else, "it is the goal for the edk2 consumes to ...". Do you agree? (I'll come to the second patch sometime later.) Thanks! Laszlo > consumers to updating the working tree of the submodules to match the > commit / release tag that the superproject expects. > > Removing "--remote" option to fix the documentation issue here. > > Cc: Laszlo Ersek > Cc: Ye Ting > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Long Qin > --- > CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt b/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt > index ac63d4c077..36f8e711dd 100644 > --- a/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt > +++ b/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt > @@ -40,7 +40,7 @@ or > And use the following combined commands to pull the remote submodule updates > (e.g. Updating the new supported OpenSSL release tag): > $ git pull --recurse-submodules && \ > - git submodule update --recursive --remote > + git submodule update --recursive > > ============================================================================= > About process_files.pl >