summaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-06-25 22:14:10 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-27 14:11:28 -0700
commit5a56da58060e50980fab0f4c38203a25440d1530 (patch)
tree6fe378e7b0adf7d5e3a72cbaa16de34e3a53e1f5 /unpack-trees.h
parenta429d2dd76c81cb52fb17463821a457e541637ce (diff)
downloadgit-5a56da58060e50980fab0f4c38203a25440d1530.tar.gz
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>
Diffstat (limited to 'unpack-trees.h')
-rw-r--r--unpack-trees.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 1e0e2325f1..d19df44f40 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -17,18 +17,18 @@ struct unpack_trees_error_msgs {
};
struct unpack_trees_options {
- unsigned int reset:1,
- merge:1,
- update:1,
- index_only:1,
- nontrivial_merge:1,
- trivial_merges_only:1,
- verbose_update:1,
- aggressive:1,
- skip_unmerged:1,
- initial_checkout:1,
- diff_index_cached:1,
- gently:1;
+ unsigned int reset,
+ merge,
+ update,
+ index_only,
+ nontrivial_merge,
+ trivial_merges_only,
+ verbose_update,
+ aggressive,
+ skip_unmerged,
+ initial_checkout,
+ diff_index_cached,
+ gently;
const char *prefix;
int pos;
struct dir_struct *dir;