[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.

[git.git] / read-tree.c

diff --git a/read-tree.c b/read-tree.c
index 6a5c08c..ca80873 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -655,7 +655,7 @@ int main(int argc, char **argv)
                        die("failed to unpack tree object %s", arg);
                stage++;
        }
-       if (update && !merge)
+       if ((update||index_only) && !merge)
                usage(read_tree_usage);
        if (merge && !fn) {
                if (stage < 2)