path: root/diff-helper.c
diff options
authorJunio C Hamano <>2005-05-14 01:41:36 (GMT)
committerPetr Baudis <>2005-05-15 00:06:05 (GMT)
commit902b92e00e491a60d55c4b2bce122903b8347f34 (patch)
treec8c77f67ea85ee65a0f055f2cb76e6059eaa0776 /diff-helper.c
parent99665af5c0be0fe4319b39183e84917993153576 (diff)
[PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).
It used to be that diff-tree needed helper support to parse its raw output to generate diffs, but these days git-diff-* family produces the same output and the helper is not tied to diff-tree anymore. Drop "tree" from its name. This follows the "rename only" commit to adjust the contents of the files involved. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
Diffstat (limited to 'diff-helper.c')
1 files changed, 6 insertions, 6 deletions
diff --git a/diff-helper.c b/diff-helper.c
index 51bb658..cd0bad0 100644
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -45,8 +45,8 @@ static int parse_oneside_change(const char *cp, struct diff_spec *one,
return 0;
-static int parse_diff_tree_output(const char *buf,
- const char **spec, int cnt, int reverse)
+static int parse_diff_raw_output(const char *buf,
+ const char **spec, int cnt, int reverse)
struct diff_spec old, new;
char path[PATH_MAX];
@@ -109,8 +109,8 @@ static int parse_diff_tree_output(const char *buf,
return 0;
-static const char *diff_tree_helper_usage =
-"diff-tree-helper [-R] [-z] paths...";
+static const char *diff_helper_usage =
+"git-diff-helper [-R] [-z] paths...";
int main(int ac, const char **av) {
struct strbuf sb;
@@ -125,7 +125,7 @@ int main(int ac, const char **av) {
else if (av[1][1] == 'z')
line_termination = 0;
- usage(diff_tree_helper_usage);
+ usage(diff_helper_usage);
ac--; av++;
/* the remaining parameters are paths patterns */
@@ -135,7 +135,7 @@ int main(int ac, const char **av) {
read_line(&sb, stdin, line_termination);
if (sb.eof)
- status = parse_diff_tree_output(sb.buf, av+1, ac-1, reverse);
+ status = parse_diff_raw_output(sb.buf, av+1, ac-1, reverse);
if (status)
fprintf(stderr, "cannot parse %s\n", sb.buf);