X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tar-tree.c;h=33087366c350655fe92837ba0fe0b3ac80865f33;hb=d14f776402d9f7040cc71ff6e3b992b2e019526a;hp=8d9e31c20612f09f641a53b7876591b744eb0cea;hpb=65b5e41e24dd76e9cc272399f458857d5b13d63e;p=git.git

diff --git a/tar-tree.c b/tar-tree.c
index 8d9e31c2..33087366 100644
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -3,7 +3,7 @@
  */
 #include <time.h>
 #include "cache.h"
-#include "diff.h"
+#include "tree-walk.h"
 #include "commit.h"
 #include "strbuf.h"
 #include "tar.h"
@@ -94,7 +94,6 @@ static void write_blocked(void *buf, unsigned long size)
 	}
 	if (size) {
 		memcpy(block + offset, buf, size);
-		buf += size;
 		offset += size;
 	}
 	tail = offset % RECORDSIZE;
@@ -322,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);
@@ -336,7 +335,7 @@ int main(int argc, char **argv)
 	} else
 		archive_time = time(NULL);
 
-	tree.buf = read_object_with_reference(sha1, "tree", &tree.size,
+	tree.buf = read_object_with_reference(sha1, tree_type, &tree.size,
 	                                      tree_sha1);
 	if (!tree.buf)
 		die("not a reference to a tag, commit or tree object: %s",