Re: [PATCH 2/2] read-tree: at least one tree-ish argument is required
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Dec 18, 2009, 09:51 UTC
- Message-ID
- <4B2B5085.1050906@viscovery.net>
- In-Reply-To
- <4B274C3A.4060808@viscovery.net>
You have queued 1/2 (filter-branch: remove an unnecessary use of 'git read-tree') of this 2-patch series, but I haven't seen any comments about this 2/2 nor is it queued. Did it fall through the cracks?
--- 8< --- From: Johannes Sixt <j6t@kdbg.org> Date: Tue, 15 Dec 2009 09:21:53 +0100 Subject: [PATCH] read-tree: at least one tree-ish argument is required
Previously, it was possible to run read-tree without any arguments, whereupon it purged the index!
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- builtin-read-tree.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 50413ca..31623b9 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -125,6 +125,9 @@ int cmd_read_tree(int argc, const char **argv, stage = opts.merge = 1; } + if (argc == 0) + usage_with_options(read_tree_usage, read_tree_options); + for (i = 0; i < argc; i++) { const char *arg = argv[i];
-- 1.6.6.rc3.54.g0f72d