Merge branch 'ja/do-not-ask-needless-questions' into maint

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 23e212ee8c5b2d26f03ac6be2b822a87ad06c233..38344256791a1232963f6153bea3bbfcf94481e7 100644 (file)
--- 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("you must specify at least one tree to merge");
+                       break;
                case 1:
                        opts.fn = opts.prefix ? bind_merge : oneway_merge;
                        break;