Merge branch 'jc/grep' into next

diff --git a/read-tree.c b/read-tree.c
index 5d304641067779b2c630a616279937378fe60c2c..c25385d79f605c74ae9e9cde06225f0a4c834f00 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -880,8 +880,8 @@ int main(int argc, char **argv)
                if (1 < index_only + update)
                        usage(read_tree_usage);
 
-               if (get_sha1(arg, sha1) < 0)
-                       usage(read_tree_usage);
+               if (get_sha1(arg, sha1))
+                       die("Not a valid object name %s", arg);
                if (list_tree(sha1) < 0)
                        die("failed to unpack tree object %s", arg);
                stage++;