Merge branch 'sb/merge-commit-msg-hook' into next

diff --git a/pathspec.c b/pathspec.c
index 1079362450e2f4d8a054ef7cb155a0fbcbc065bc..82eb39cd679ffbce82abac691c6f4343335b9924 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -526,10 +526,6 @@ static void NORETURN unsupported_magic(const char *pattern,
            pattern, sb.buf);
 }
 
-/*
- * Given command line arguments and a prefix, convert the input to
- * pathspec. die() if any magic in magic_mask is used.
- */
 void parse_pathspec(struct pathspec *pathspec,
                    unsigned magic_mask, unsigned flags,
                    const char *prefix, const char **argv)