X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-tree.c;h=0f370927dd2496a420af53d137676b6c3c445f75;hb=aba06682473e2d797011f966d66c93043e3ed57a;hp=da50e575d6a48f0dce81d65721629ae60a3094f9;hpb=33b238d128a4f7ada055eac99ae8f9546003e7d0;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index da50e575d..0f370927d 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 
 static int recursive = 0;
+static int line_termination = '\n';
 
 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
 
@@ -75,7 +76,8 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
 
 	printf("%s%o\t%s\t%s\t%s%s%c", prefix, mode,
 	       S_ISDIR(mode) ? "tree" : "blob",
-	       sha1_to_hex(sha1), base, path, 0);
+	       sha1_to_hex(sha1), base, path,
+	       line_termination);
 }
 
 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
@@ -124,7 +126,8 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
 	strcpy(old_sha1_hex, sha1_to_hex(sha1));
 	printf("*%o->%o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
 	       S_ISDIR(mode1) ? "tree" : "blob",
-	       old_sha1_hex, sha1_to_hex(sha2), base, path1, 0);
+	       old_sha1_hex, sha1_to_hex(sha2), base, path1,
+	       line_termination);
 	return 0;
 }
 
@@ -161,14 +164,13 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 {
 	void *tree1, *tree2;
 	unsigned long size1, size2;
-	char type[20];
 	int retval;
 
-	tree1 = read_sha1_file(old, type, &size1);
-	if (!tree1 || strcmp(type, "tree"))
+	tree1 = read_tree_with_tree_or_commit_sha1(old, &size1, 0);
+	if (!tree1)
 		die("unable to read source tree (%s)", sha1_to_hex(old));
-	tree2 = read_sha1_file(new, type, &size2);
-	if (!tree2 || strcmp(type, "tree"))
+	tree2 = read_tree_with_tree_or_commit_sha1(new, &size2, 0);
+	if (!tree2)
 		die("unable to read destination tree (%s)", sha1_to_hex(new));
 	retval = diff_tree(tree1, size1, tree2, size2, base);
 	free(tree1);
@@ -176,6 +178,8 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 	return retval;
 }
 
+static char *diff_tree_usage = "diff-tree [-r] [-z] <tree sha1> <tree sha1>";
+
 int main(int argc, char **argv)
 {
 	unsigned char old[20], new[20];
@@ -188,10 +192,14 @@ int main(int argc, char **argv)
 			recursive = 1;
 			continue;
 		}
-		usage("diff-tree [-r] <tree sha1> <tree sha1>");
+		if (!strcmp(arg, "-z")) {
+			line_termination = '\0';
+			continue;
+		}
+		usage(diff_tree_usage);
 	}
 
 	if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
-		usage("diff-tree <tree sha1> <tree sha1>");
+		usage(diff_tree_usage);
 	return diff_tree_sha1(old, new, "");
 }