Teach git diff-tree --stdin to diff trees
When feeding trees on the command line, you can give exactly two trees, not three nor one; --stdin now supports this "two tree" form on its input, in addition to accepting lines with one or more commits. When diffing trees (either specified on the command line or from the standard input), the -s, -v, --pretty, --abbrev-commit, --encoding, --no-commit-id, and --always options are ignored, since they do not apply to trees; and the -m, -c, and --cc options are ignored since they would be meaningful only with three or more trees, which is not supported (yet). Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Karl Hasselström committed
Aug 10, 2008 at 18:12 UTC
140b378d07229e3bcef0613e11aa0a04e4db3ecf
2 files changed
+39
-9
Documentation/git-diff-tree.txt
+10
-5
@@ -49,17 +49,22 @@ include::diff-options.txt[]
49
--stdin::
50
When '--stdin' is specified, the command does not take
51
<tree-ish> arguments from the command line. Instead, it
52
- reads either one <commit> or a list of <commit>
53
- separated with a single space from its standard input.
52
+ reads lines containing either two <tree>, one <commit>, or a
53
+ list of <commit> from its standard input. (Use a single space
54
+ as separator.)
55
+
56
+When two trees are given, it compares the first tree with the second.
57
When a single commit is given, it compares the commit with its
58
parents. The remaining commits, when given, are used as if they are
59
parents of the first commit.
60
+
59
-The ID of the first (or only) commit, followed by a newline, is
60
-printed before the differences.
61
+When comparing two trees, the ID of both trees (separated by a space
62
+and terminated by a newline) is printed before the difference. When
63
+comparing commits, the ID of the first (or only) commit, followed by a
64
+newline, is printed.
65
+
62
-The following flags further affects its behavior.
66
+The following flags further affects the behavior when comparing
67
+commits (but not trees).
68
69
-m::
70
By default, 'git-diff-tree --stdin' does not show
builtin-diff-tree.c
+29
-4
@@ -42,21 +42,46 @@ static int stdin_diff_commit(struct commit *commit, char *line, int len)
42
return log_tree_commit(&log_tree_opt, commit);
43
}
44
45
+/* Diff two trees. */
46
+static int stdin_diff_trees(struct tree *tree1, char *line, int len)
47
+{
48
+ unsigned char sha1[20];
49
+ struct tree *tree2;
50
+ if (len != 82 || !isspace(line[40]) || get_sha1_hex(line + 41, sha1))
51
+ return error("Need exactly two trees, separated by a space");
52
+ tree2 = lookup_tree(sha1);
53
+ if (!tree2 || parse_tree(tree2))
54
+ return -1;
55
+ printf("%s %s\n", sha1_to_hex(tree1->object.sha1),
56
+ sha1_to_hex(tree2->object.sha1));
57
+ diff_tree_sha1(tree1->object.sha1, tree2->object.sha1,
58
+ "", &log_tree_opt.diffopt);
59
+ log_tree_diff_flush(&log_tree_opt);
60
+ return 0;
61
+}
62
+
63
static int diff_tree_stdin(char *line)
64
{
65
int len = strlen(line);
66
unsigned char sha1[20];
49
- struct commit *commit;
67
+ struct object *obj;
68
69
if (!len || line[len-1] != '\n')
70
return -1;
71
line[len-1] = 0;
72
if (get_sha1_hex(line, sha1))
73
return -1;
56
- commit = lookup_commit(sha1);
57
- if (!commit || parse_commit(commit))
74
+ obj = lookup_object(sha1);
75
+ obj = obj ? obj : parse_object(sha1);
76
+ if (!obj)
77
return -1;
59
- return stdin_diff_commit(commit, line, len);
78
+ if (obj->type == OBJ_COMMIT)
79
+ return stdin_diff_commit((struct commit *)obj, line, len);
80
+ if (obj->type == OBJ_TREE)
81
+ return stdin_diff_trees((struct tree *)obj, line, len);
82
+ error("Object %s is a %s, not a commit or tree",
83
+ sha1_to_hex(sha1), typename(obj->type));
84
+ return -1;
85
}
86
87
static const char diff_tree_usage[] =