Merge branch 'nd/maint-work-tree-fix' into maint

diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index 8055ddab9b07e017a832e2fedf31b35fa0788a13..b04719ef20929d40ef0c898c37616a5e7316f272 100644 (file)
--- a/builtin-tar-tree.c
+++ b/builtin-tar-tree.c
@@ -31,7 +31,7 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix)
        nargv[nargc++] = "git-archive";
        nargv[nargc++] = "--format=tar";
 
-       if (2 <= argc && !strncmp("--remote=", argv[1], 9)) {
+       if (2 <= argc && !prefixcmp(argv[1], "--remote=")) {
                nargv[nargc++] = argv[1];
                argv++;
                argc--;