From de694d232f1a1b1fe2ca4c7549242d7ef96cf759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Mon, 16 Jan 2012 09:36:47 +0700 Subject: commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Normally cache-tree will not produce trees from an index that has CE_INTENT_TO_ADD entries. This is a safe measure to avoid mis-interpreting user's intention regarding this flag. There are situations however where users want to create trees/commits regardless i-t-a entries. Allow such cases with commit.ignoreIntentToAdd for git-commit and --ignore-intent-to-add for git-write-tree. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/write-tree.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin/write-tree.c') diff --git a/builtin/write-tree.c b/builtin/write-tree.c index b223af416f..07797bb427 100644 --- a/builtin/write-tree.c +++ b/builtin/write-tree.c @@ -23,6 +23,8 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix) struct option write_tree_options[] = { OPT_BIT(0, "missing-ok", &flags, "allow missing objects", WRITE_TREE_MISSING_OK), + OPT_BIT(0, "ignore-intent-to-add", &flags, "ignore i-t-a entries in index", + WRITE_TREE_IGNORE_INTENT_TO_ADD ), { OPTION_STRING, 0, "prefix", &prefix, "/", "write tree object for a subdirectory " , PARSE_OPT_LITERAL_ARGHELP }, -- cgit v1.2.1