Browse Source

[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 <junkio@cox.net>

Bundled with the changes in the unrenamed files.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
maint
Junio C Hamano 20 years ago committed by Petr Baudis
parent
commit
99665af5c0
  1. 2
      Documentation/diff-format.txt
  2. 0
      Documentation/git-diff-helper.txt
  3. 2
      Documentation/git.txt
  4. 4
      Makefile
  5. 0
      diff-helper.c
  6. 2
      diff.h

2
Documentation/diff-format.txt

@ -45,7 +45,7 @@ with a '-p' option, they do not produce the output described above @@ -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:

0
Documentation/git-diff-tree-helper.txt → Documentation/git-diff-helper.txt

2
Documentation/git.txt

@ -149,7 +149,7 @@ link:git-rpull.html[git-rpull]:: @@ -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]::

4
Makefile

@ -27,7 +27,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \ @@ -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 @@ -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


0
diff-tree-helper.c → diff-helper.c

2
diff.h

@ -17,7 +17,7 @@ extern void diff_change(unsigned mode1, unsigned mode2, @@ -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];

Loading…
Cancel
Save