summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Thomas Gummerer <t.gummerer@gmail.com>2018-12-20 13:48:17 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-02 15:28:05 -0800
commit5160fa05623dc2e9e8348d48b91f1f0bf44d369e (patch)
treee72ea534f3efc1c519fddd72ec84f7dcae38d979
parentread-cache: add invalidate parameter to remove_marked_cache_entries (diff)
downloadtgif-5160fa05623dc2e9e8348d48b91f1f0bf44d369e.tar.xz
checkout: clarify comment
The key point for the if statement is that read_tree_some did not update the entry, because either it doesn't exist in tree-ish or doesn't match the pathspec. Clarify that. Suggested-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/checkout.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index acdafc6e4c..cb166b2e07 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -304,10 +304,10 @@ static int checkout_paths(const struct checkout_opts *opts,
continue;
if (opts->source_tree && !(ce->ce_flags & CE_UPDATE))
/*
- * "git checkout tree-ish -- path", but this entry
- * is in the original index; it will not be checked
- * out to the working tree and it does not matter
- * if pathspec matched this entry. We will not do
+ * "git checkout tree-ish -- path" and this entry
+ * is in the original index, but is not in tree-ish
+ * or does not match the pathspec; it will not be
+ * checked out to the working tree. We will not do
* anything to this entry at all.
*/
continue;