Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache-tree

* jc/dirwalk-n-cache-tree: (212 commits)
  builtin-rm: squelch compiler warnings.
  Add builtin "git rm" command
  Move pathspec matching from builtin-add.c into dir.c
  Prevent bogus paths from being added to the index.
  builtin-add: fix unmatched pathspec warnings.
  Remove old "git-add.sh" remnants
  builtin-add: warn on unmatched pathspecs
  Do "git add" as a builtin
  Clean up git-ls-file directory walking library interface
  libify git-ls-files directory traversal
  Add a conversion tool to migrate remote information into the config
  fetch, pull: ask config for remote information
  Fix build procedure for builtin-init-db
  read-tree -m -u: do not overwrite or remove untracked working tree files.
  apply --cached: do not check newly added file in the working tree
  Implement a --dry-run option to git-quiltimport
  Implement git-quiltimport
  Revert "builtin-grep: workaround for non GNU grep."
  builtin-grep: workaround for non GNU grep.
  builtin-grep: workaround for non GNU grep.
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/tar-tree.c b/tar-tree.c
index fc60a9087..33087366c 100644
--- 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);