read-tree: migrate to parse-options
authorStephen Boyd <bebarino@gmail.com>
Fri, 26 Jun 2009 05:14:10 +0000 (22:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 27 Jun 2009 21:11:28 +0000 (14:11 -0700)
commit5a56da58060e50980fab0f4c38203a25440d1530
tree6fe378e7b0adf7d5e3a72cbaa16de34e3a53e1f5
parenta429d2dd76c81cb52fb17463821a457e541637ce
read-tree: migrate to parse-options

Cleanup the documentation to explicitly state that --exclude-directory
is only meaningful when used with -u. Also make the documentation more
consistent with the usage message printed with read-tree --help-all.

The -m, --prefix, --reset options are performing similar actions
(setting some flags, read_cache_unmerged(), checking for illegal option
combinations). Instead of performing these actions when the options are
parsed, we delay performing them until after parse-opts has finished.

The bit fields in struct unpack_trees_options have been promoted to full
unsigned ints. This is necessary to avoid "foo ? 1 : 0" constructs to
set these fields.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-read-tree.txt
builtin-read-tree.c
unpack-trees.h