checkout: clarify comment
authorThomas Gummerer <t.gummerer@gmail.com>
Thu, 20 Dec 2018 13:48:17 +0000 (13:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jan 2019 23:28:05 +0000 (15:28 -0800)
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>
builtin/checkout.c

index acdafc6..cb166b2 100644 (file)
@@ -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;