summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-03 11:25:18 -0800
committerJunio C Hamano <gitster@pobox.com>2017-02-03 11:25:18 -0800
commit2243d229f75be41318db8798fc90399dd6dedb42 (patch)
tree6276ce793c1e7a0820b9131291f7c1882f5d88c2 /git.c
parent8a8f121049fdd881981799755a041b3f81449805 (diff)
parent3d415425c7b6ca0d2243a4589672369e7a02fc2c (diff)
downloadgit-2243d229f75be41318db8798fc90399dd6dedb42.tar.gz
Merge branch 'sb/unpack-trees-super-prefix'
"git read-tree" and its underlying unpack_trees() machinery learned to report problematic paths prefixed with the --super-prefix option. * sb/unpack-trees-super-prefix: unpack-trees: support super-prefix option t1001: modernize style t1000: modernize style read-tree: use OPT_BOOL instead of OPT_SET_INT
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 1cf125cd28..c887272b12 100644
--- a/git.c
+++ b/git.c
@@ -472,7 +472,7 @@ static struct cmd_struct commands[] = {
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
{ "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
{ "push", cmd_push, RUN_SETUP },
- { "read-tree", cmd_read_tree, RUN_SETUP },
+ { "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },
{ "remote", cmd_remote, RUN_SETUP },