X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-read-tree.c;h=e47715538bd1ff81d1a91e0a43cd9bdbe1cb0d3f;hb=d81bf827192f0af6b1cca64d2cdbaac9b5ca2020;hp=3f6cae36ce9b730bf6b76f3f1fedd006f356854b;hpb=f8a9d4287277ed15d3f0d61004f4510c59f1f392;p=git.git diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 3f6cae36c..e47715538 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -85,7 +85,7 @@ static void prime_cache_tree(void) } -static const char read_tree_usage[] = "git-read-tree ( | [[-m [--aggressive] | --reset | --prefix=] [-u | -i]] [ []])"; +static const char read_tree_usage[] = "git-read-tree ( | [[-m [--aggressive] | --reset | --prefix=] [-u | -i]] [--exclude-per-directory=] [ []])"; static struct lock_file lock_file; @@ -133,7 +133,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) * entries and put the entries from the tree under the * given subdirectory. */ - if (!strncmp(arg, "--prefix=", 9)) { + if (!prefixcmp(arg, "--prefix=")) { if (stage || opts.merge || opts.prefix) usage(read_tree_usage); opts.prefix = arg + 9; @@ -179,7 +179,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) continue; } - if (!strncmp(arg, "--exclude-per-directory=", 24)) { + if (!prefixcmp(arg, "--exclude-per-directory=")) { struct dir_struct *dir; if (opts.dir)