git-read-tree: -u without -m is meaningless. Don't allow it.

Also, documetn the "-u" in the usage string.

diff --git a/read-tree.c b/read-tree.c
index cf6d28e2c9ee689a5ea49d715bc56773b266efa8..fbd0da0ebdc5c523b7f35399a39a3b8efd373112 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -275,7 +275,7 @@ static void merge_cache(struct cache_entry **src, int nr, merge_fn_t fn)
        check_updates(active_cache, active_nr);
 }
 
-static char *read_tree_usage = "git-read-tree (<sha> | -m <sha1> [<sha2> [<sha3>]])";
+static char *read_tree_usage = "git-read-tree (<sha> | -m [-u] <sha1> [<sha2> [<sha3>]])";
 
 static struct cache_file cache_file;
 
@@ -320,6 +320,8 @@ int main(int argc, char **argv)
                        die("failed to unpack tree object %s", arg);
                stage++;
        }
+       if (update && !merge)
+               usage(read_tree_usage);
        if (merge) {
                static const merge_fn_t merge_function[] = {
                        [1] = oneway_merge,