[PATCH 3/4] read-tree.c: rework UI when merging no trees
- From
Jean-Noel Avila <jn.avila@free.fr>
- Date
- May 3, 2017, 16:29 UTC
- Message-ID
- <20170503162931.30721-3-jn.avila@free.fr>
- In-Reply-To
- <20170503162931.30721-1-jn.avila@free.fr>
The initial test was inherited from a previous commit, but it is no longer needed, given the following switch case. Moreover, the question sentence ending the program has been replace by an assertative one.
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> --- builtin/read-tree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 23e212ee8..05296997c 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -226,9 +226,10 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) setup_work_tree(); if (opts.merge) { - if (stage < 2) - die("just how do you expect me to merge %d trees?", stage-1); switch (stage - 1) { + case 0: + die("there are no trees to merge!"); + break; case 1: opts.fn = opts.prefix ? bind_merge : oneway_merge; break;
-- 2.12.0