{"thread":{"id":"609","subject":"[PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).","startedAt":"2005-05-14T01:41:36Z","lastAt":"2005-05-14T01:41:36Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"3276","messageId":"7vbr7e60tr.fsf@assigned-by-dhcp.cox.net","threadId":"609","inReplyTo":null,"subject":"[PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-05-14T01:41:36Z","receivedAt":"2005-05-14T01:41:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"It used to be that diff-tree needed helper support to parse its\nraw output to generate diffs, but these days git-diff-* family\nproduces the same output and the helper is not tied to diff-tree\nanymore.  Drop \"tree\" from its name.\n\nThis follows the \"rename only\" commit to adjust the contents of\nthe files involved.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n\nDocumentation/diff-format.txt     |    2 +-\nDocumentation/git-diff-helper.txt |   10 +++++-----\nDocumentation/git.txt             |    2 +-\nMakefile                          |    4 ++--\ndiff-helper.c                     |   12 ++++++------\ndiff.h                            |    2 +-\n6 files changed, 16 insertions(+), 16 deletions(-)\n\n--- a/Documentation/diff-format.txt\n+++ b/Documentation/diff-format.txt\n@@ -45,7 +45,7 @@\n instead they produce a patch file.\n \n The patch generation can be customized at two levels.  This\n-customization also applies to \"git-diff-tree-helper\".\n+customization also applies to \"git-diff-helper\".\n \n 1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set,\n    these commands internally invoke \"diff\" like this:\n--- a/Documentation/git-diff-helper.txt\n+++ b/Documentation/git-diff-helper.txt\n@@ -1,15 +1,15 @@\n-git-diff-tree-helper(1)\n+git-diff-helper(1)\n =======================\n v0.1, May 2005\n \n NAME\n ----\n-git-diff-tree-helper - Generates patch format output for git-diff-*\n+git-diff-helper - Generates patch format output for git-diff-*\n \n \n SYNOPSIS\n --------\n-'git-diff-tree-helper' [-z] [-R]\n+'git-diff-helper' [-z] [-R]\n \n DESCRIPTION\n -----------\n@@ -26,8 +26,8 @@\n \t\"git-diff-cache\" which always compares tree with cache or working\n \tfile.  E.g.\n \n-\t\tgit-diff-cache <tree> | git-diff-tree-helper -R file.c\n-+\n+\t\tgit-diff-cache <tree> | git-diff-helper -R file.c\n+\n would show a diff to bring the working file back to what is in the <tree>.\n \n See Also\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -149,7 +149,7 @@\n \n Interogators:\n \n-link:git-diff-tree-helper.html[git-diff-tree-helper]::\n+link:git-diff-helper.html[git-diff-helper]::\n \tGenerates patch format output for git-diff-*\n \n link:git-rpush.html[git-rpush]::\n--- a/Makefile\n+++ b/Makefile\n@@ -27,7 +27,7 @@\n \tgit-check-files git-ls-tree git-merge-base git-merge-cache \\\n \tgit-unpack-file git-export git-diff-cache git-convert-cache \\\n \tgit-http-pull git-rpush git-rpull git-rev-list git-mktag \\\n-\tgit-diff-tree-helper git-tar-tree git-local-pull git-write-blob \\\n+\tgit-diff-helper git-tar-tree git-local-pull git-write-blob \\\n \tgit-get-tar-commit-id\n \n all: $(PROG)\n@@ -101,7 +101,7 @@\n git-rpull: rsh.c pull.c\n git-rev-list: rev-list.c\n git-mktag: mktag.c\n-git-diff-tree-helper: diff-tree-helper.c\n+git-diff-helper: diff-helper.c\n git-tar-tree: tar-tree.c\n git-write-blob: write-blob.c\n \n--- a/diff-helper.c\n+++ b/diff-helper.c\n@@ -45,8 +45,8 @@\n \treturn 0;\n }\n \n-static int parse_diff_tree_output(const char *buf,\n-\t\t\t\t  const char **spec, int cnt, int reverse)\n+static int parse_diff_raw_output(const char *buf,\n+\t\t\t\t const char **spec, int cnt, int reverse)\n {\n \tstruct diff_spec old, new;\n \tchar path[PATH_MAX];\n@@ -109,8 +109,8 @@\n \treturn 0;\n }\n \n-static const char *diff_tree_helper_usage =\n-\"diff-tree-helper [-R] [-z] paths...\";\n+static const char *diff_helper_usage =\n+\"git-diff-helper [-R] [-z] paths...\";\n \n int main(int ac, const char **av) {\n \tstruct strbuf sb;\n@@ -125,7 +125,7 @@\n \t\telse if (av[1][1] == 'z')\n \t\t\tline_termination = 0;\n \t\telse\n-\t\t\tusage(diff_tree_helper_usage);\n+\t\t\tusage(diff_helper_usage);\n \t\tac--; av++;\n \t}\n \t/* the remaining parameters are paths patterns */\n@@ -135,7 +135,7 @@\n \t\tread_line(&sb, stdin, line_termination);\n \t\tif (sb.eof)\n \t\t\tbreak;\n-\t\tstatus = parse_diff_tree_output(sb.buf, av+1, ac-1, reverse);\n+\t\tstatus = parse_diff_raw_output(sb.buf, av+1, ac-1, reverse);\n \t\tif (status)\n \t\t\tfprintf(stderr, \"cannot parse %s\\n\", sb.buf);\n \t}\n--- a/diff.h\n+++ b/diff.h\n@@ -17,7 +17,7 @@\n \n extern void diff_unmerge(const char *path);\n \n-/* These are for diff-tree-helper */\n+/* These are for diff-helper */\n \n struct diff_spec {\n \tunsigned char blob_sha1[20];\n------------------------------------------------\n\n"}]}