From: Long Qin <qin.long@intel.com>
To: lersek@redhat.com, ting.ye@intel.com
Cc: edk2-devel@lists.01.org
Subject: [PATCH v2 1/2] CryptoPkg/OpensslLib: Fix the documentation about submodule update
Date: Thu, 12 Apr 2018 11:08:00 +0800 [thread overview]
Message-ID: <20180412030801.14216-2-qin.long@intel.com> (raw)
In-Reply-To: <20180412030801.14216-1-qin.long@intel.com>
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
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 <lersek@redhat.com>
Cc: Ye Ting <ting.ye@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Long Qin <qin.long@intel.com>
---
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
--
2.16.1.windows.1
next prev parent reply other threads:[~2018-04-12 3:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-12 3:07 [PATCH v2 0/2] Update OpenSSL version to 1.1.0h Long Qin
2018-04-12 3:08 ` Long Qin [this message]
2018-04-12 9:55 ` [PATCH v2 1/2] CryptoPkg/OpensslLib: Fix the documentation about submodule update Laszlo Ersek
2018-04-12 10:03 ` Long, Qin
2018-04-12 12:05 ` Laszlo Ersek
2018-04-13 20:03 ` Laszlo Ersek
2018-04-12 3:08 ` [PATCH v2 2/2] CryptoPkg/OpensslLib: Update OpenSSL version to 1.1.0h Long Qin
2018-04-13 20:07 ` Laszlo Ersek
2018-04-15 13:17 ` Long, Qin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180412030801.14216-2-qin.long@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox