@matheusbsbs / matheus-bagliano / commits / e0c97ca63d
Fork 0

Make git-diff-tree indicate when it flushes

There are times when gitk needs to know that the commits it has sent to git-diff-tree --stdin did not match, and it needs to know in a timely fashion even if none of them match. At the moment, git-diff-tree outputs nothing for non-matching commits, so it is impossible for gitk to distinguish between git-diff-tree being slow and git-diff-tree saying no. This makes git-diff-tree flush its output and echo back the input line when it is not a valid-looking object name. Gitk, or other users of git-diff-tree --stdin, can use a blank line or any other "marker line" to indicate that git-diff-tree has processed all the commits on its input up to the echoed back marker line, and any commits that have not been output do not match. [jc: re-done after a couple of back-and-forth discussion on the list.] Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Paul Mackerras committed May 29, 2006 at 19:01 UTC e0c97ca63df2590026fe1f9a76fefba54b291d06
1 file changed +7 -3
builtin-diff-tree.c
+7 -3
@@ -138,11 +138,15 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
138 if (opt->diffopt.detect_rename)
139 opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
140 DIFF_SETUP_USE_CACHE);
141 - while (fgets(line, sizeof(line), stdin))
142 - if (line[0] == '\n')
141 + while (fgets(line, sizeof(line), stdin)) {
142 + unsigned char sha1[20];
143 +
144 + if (get_sha1_hex(line, sha1)) {
145 + fputs(line, stdout);
146 fflush(stdout);
147 + }
148 else
149 diff_tree_stdin(line);
146 -
150 + }
151 return 0;
152 }