From 99665af5c0be0fe4319b39183e84917993153576 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 13 May 2005 18:40:54 -0700 Subject: [PATCH] [PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper. 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 commit is done separately to record just the rename and no file content changes. The changes in the renamed files are recorded in the next commit. Signed-off-by: Junio C Hamano Bundled with the changes in the unrenamed files. Signed-off-by: Petr Baudis --- Documentation/diff-format.txt | 2 +- .../{git-diff-tree-helper.txt => git-diff-helper.txt} | 0 Documentation/git.txt | 2 +- Makefile | 4 ++-- diff-tree-helper.c => diff-helper.c | 0 diff.h | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename Documentation/{git-diff-tree-helper.txt => git-diff-helper.txt} (100%) rename diff-tree-helper.c => diff-helper.c (100%) diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 1a99e85ee..9e6453997 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -45,7 +45,7 @@ with a '-p' option, they do not produce the output described above instead they produce a patch file. The patch generation can be customized at two levels. This -customization also applies to "git-diff-tree-helper". +customization also applies to "git-diff-helper". 1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set, these commands internally invoke "diff" like this: diff --git a/Documentation/git-diff-tree-helper.txt b/Documentation/git-diff-helper.txt similarity index 100% rename from Documentation/git-diff-tree-helper.txt rename to Documentation/git-diff-helper.txt diff --git a/Documentation/git.txt b/Documentation/git.txt index 98d923db9..134afffe3 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -149,7 +149,7 @@ link:git-rpull.html[git-rpull]:: Interogators: -link:git-diff-tree-helper.html[git-diff-tree-helper]:: +link:git-diff-helper.html[git-diff-helper]:: Generates patch format output for git-diff-* link:git-rpush.html[git-rpush]:: diff --git a/Makefile b/Makefile index 92b7cdf76..23129c442 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-check-files git-ls-tree git-merge-base git-merge-cache \ git-unpack-file git-export git-diff-cache git-convert-cache \ git-http-pull git-rpush git-rpull git-rev-list git-mktag \ - git-diff-tree-helper git-tar-tree git-local-pull git-write-blob \ + git-diff-helper git-tar-tree git-local-pull git-write-blob \ git-get-tar-commit-id all: $(PROG) @@ -101,7 +101,7 @@ git-rpush: rsh.c git-rpull: rsh.c pull.c git-rev-list: rev-list.c git-mktag: mktag.c -git-diff-tree-helper: diff-tree-helper.c +git-diff-helper: diff-helper.c git-tar-tree: tar-tree.c git-write-blob: write-blob.c diff --git a/diff-tree-helper.c b/diff-helper.c similarity index 100% rename from diff-tree-helper.c rename to diff-helper.c diff --git a/diff.h b/diff.h index 0b76cc428..c146d8acf 100644 --- a/diff.h +++ b/diff.h @@ -17,7 +17,7 @@ extern void diff_change(unsigned mode1, unsigned mode2, extern void diff_unmerge(const char *path); -/* These are for diff-tree-helper */ +/* These are for diff-helper */ struct diff_spec { unsigned char blob_sha1[20]; -- 2.26.2