Merge branch 'rt/rebase-p-no-merge-summary'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 62a96a7e2fb868ab93f83d7b8df5aecf20aad3d4..0f573970372664a16024e83ed9733c94eeee3b50 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1146,13 +1146,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
        }
 
        if (argc) {
-               /*
-                * In patch mode (opts.patch_mode != 0), we pass the
-                * pathspec to an external program, git-add--interactive.
-                * Do not accept any kind of magic that that program
-                * cannot handle. Magic mask is pretty safe to be
-                * lifted for new magic when opts.patch_mode == 0.
-                */
                parse_pathspec(&opts.pathspec, 0,
                               opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
                               prefix, argv);