Merge branch 'lt/oneway' into next

diff --git a/tar-tree.c b/tar-tree.c
index fc60a90873d1928ce3ada6d26f0a0ae571d43773..33087366c350655fe92837ba0fe0b3ac80865f33 100644 (file)
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -321,8 +321,8 @@ int main(int argc, char **argv)
                strbuf_append_string(&current_path, "/");
                /* FALLTHROUGH */
        case 2:
-               if (get_sha1(argv[1], sha1) < 0)
-                       usage(tar_tree_usage);
+               if (get_sha1(argv[1], sha1))
+                       die("Not a valid object name %s", argv[1]);
                break;
        default:
                usage(tar_tree_usage);