X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-tree.c;h=8cfe990023bbae14ff36a23bed1923513a9b022e;hb=0a8365a179685feecee427075a9c2db8a66c434a;hp=51e3274f36dd7792fdbd20fdde4f4e7546f3b10b;hpb=a02ebff6127c5fc981668fb570f0a80f2b7657ca;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index 51e3274f..8cfe9900 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -342,27 +342,11 @@ static char *generate_header(const char *commit, const char *parent, const char
 	return this_header;
 }
 
-static int diff_tree_stdin(char *line)
+static int diff_tree_commit(const unsigned char *commit, const char *name)
 {
-	int len = strlen(line);
-	unsigned char commit[20], parent[20];
 	unsigned long size, offset;
-	static char this_header[1000];
-	char *buf;
+	char *buf = read_object_with_reference(commit, "commit", &size, NULL);
 
-	if (!len || line[len-1] != '\n')
-		return -1;
-	line[len-1] = 0;
-	if (get_sha1_hex(line, commit))
-		return -1;
-	if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
-		line[40] = 0;
-		line[81] = 0;
-		sprintf(this_header, "%s (from %s)\n", line, line+41);
-		header = this_header;
-		return diff_tree_sha1(parent, commit, "");
-	}
-	buf = read_object_with_reference(commit, "commit", &size, NULL);
 	if (!buf)
 		return -1;
 
@@ -372,18 +356,40 @@ static int diff_tree_stdin(char *line)
 			return 0;
 	}
 
-	line[40] = 0;
 	offset = 46;
 	while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
+		unsigned char parent[20];
 		if (get_sha1_hex(buf + offset + 7, parent))
 			return -1;
-		header = generate_header(line, sha1_to_hex(parent), buf, size);
+		header = generate_header(name, sha1_to_hex(parent), buf, size);
 		diff_tree_sha1(parent, commit, "");
 		if (!header && verbose_header)
 			header_prefix = "\ndiff-tree ";
 		offset += 48;
 	}
-	return -1;
+	return 0;
+}
+
+static int diff_tree_stdin(char *line)
+{
+	int len = strlen(line);
+	unsigned char commit[20], parent[20];
+	static char this_header[1000];
+
+	if (!len || line[len-1] != '\n')
+		return -1;
+	line[len-1] = 0;
+	if (get_sha1_hex(line, commit))
+		return -1;
+	if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
+		line[40] = 0;
+		line[81] = 0;
+		sprintf(this_header, "%s (from %s)\n", line, line+41);
+		header = this_header;
+		return diff_tree_sha1(parent, commit, "");
+	}
+	line[40] = 0;
+	return diff_tree_commit(commit, line);
 }
 
 static char *diff_tree_usage =
@@ -391,19 +397,29 @@ static char *diff_tree_usage =
 
 int main(int argc, char **argv)
 {
+	int nr_sha1;
 	char line[1000];
-	unsigned char old[20], new[20];
+	unsigned char sha1[2][20];
 
+	nr_sha1 = 0;
 	for (;;) {
 		char *arg;
 
 		argv++;
 		argc--;
 		arg = *argv;
-		if (!arg || *arg != '-')
+		if (!arg)
 			break;
 
-		if (!strcmp(arg, "-")) {
+		if (*arg != '-') {
+			if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
+				nr_sha1++;
+				continue;
+			}
+			break;
+		}
+
+		if (!strcmp(arg, "--")) {
 			argv++;
 			argc--;
 			break;
@@ -440,13 +456,6 @@ int main(int argc, char **argv)
 		usage(diff_tree_usage);
 	}
 
-	if (!read_stdin) {
-		if (argc < 2 || get_sha1(argv[0], old) || get_sha1(argv[1], new))
-			usage(diff_tree_usage);
-		argv += 2;
-		argc -= 2;
-	}
-
 	if (argc > 0) {
 		int i;
 
@@ -457,8 +466,21 @@ int main(int argc, char **argv)
 			pathlens[i] = strlen(paths[i]);
 	}
 
+	switch (nr_sha1) {
+	case 0:
+		if (!read_stdin)
+			usage(diff_tree_usage);
+		break;
+	case 1:
+		diff_tree_commit(sha1[0], sha1_to_hex(sha1[0]));
+		break;
+	case 2:
+		diff_tree_sha1(sha1[0], sha1[1], "");
+		break;
+	}
+
 	if (!read_stdin)
-		return diff_tree_sha1(old, new, "");
+		return 0;
 
 	while (fgets(line, sizeof(line), stdin))
 		diff_tree_stdin(line);