read-tree: convert unhelpful usage()'s to helpful die()'s

Printing the usage message when encountering bad option combinations is
not very helpful. Instead, die with a message which tells the user
exactly what combination is invalid.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 82e25eaa0758d8b9584592f4072f81eeccb0bf1d..17c96310ab66987dd02ef118d8f43d8d45923d01 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -145,9 +145,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
                        continue;
                }
 
                        continue;
                }
 

-               /* using -u and -i at the same time makes no sense */

                if (1 < opts.index_only + opts.update)
                if (1 < opts.index_only + opts.update)

-                       usage(read_tree_usage);
+                       die("-u and -i at the same time makes no sense");

 
                if (get_sha1(arg, sha1))
                        die("Not a valid object name %s", arg);
 
                if (get_sha1(arg, sha1))
                        die("Not a valid object name %s", arg);


@@ -156,7 +155,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
                stage++;
        }
        if ((opts.update||opts.index_only) && !opts.merge)
                stage++;
        }
        if ((opts.update||opts.index_only) && !opts.merge)

-               usage(read_tree_usage);
+               die("%s is meaningless without -m, --reset, or --prefix",
+                   opts.update ? "-u" : "-i");

        if ((opts.dir && !opts.update))
                die("--exclude-per-directory is meaningless unless -u");
        if (opts.merge && !opts.index_only)
        if ((opts.dir && !opts.update))
                die("--exclude-per-directory is meaningless unless -u");
        if (opts.merge && !opts.index_only)