Skip to content

Commit 215a7ad

Browse files
author
Junio C Hamano
committed
Big tool rename.
As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 99977bd commit 215a7ad

File tree

160 files changed

+1023
-915
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+1023
-915
lines changed

‎.gitignore‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
git-apply
22
git-build-rev-cache
33
git-cat-file
4-
git-checkout-cache
4+
git-checkout-index
55
git-clone-pack
66
git-commit-tree
7-
git-convert-cache
7+
git-convert-objects
88
git-daemon
9-
git-diff-cache
9+
git-diff-index
1010
git-diff-files
1111
git-diff-helper
1212
git-diff-stages
1313
git-diff-tree
1414
git-export
1515
git-fetch-pack
16-
git-fsck-cache
16+
git-fsck-objects
1717
git-get-tar-commit-id
1818
git-hash-object
19-
git-http-pull
19+
git-http-fetch
2020
git-init-db
21-
git-local-pull
21+
git-local-fetch
2222
git-ls-files
2323
git-ls-tree
2424
git-merge-base
25-
git-merge-cache
25+
git-merge-index
2626
git-mktag
2727
git-pack-objects
2828
git-patch-id
@@ -37,13 +37,13 @@ git-send-pack
3737
git-show-branch
3838
git-show-index
3939
git-show-rev-cache
40-
git-ssh-pull
41-
git-ssh-push
40+
git-ssh-fetch
41+
git-ssh-upload
4242
git-stripspace
4343
git-tar-tree
4444
git-unpack-file
4545
git-unpack-objects
46-
git-update-cache
46+
git-update-index
4747
git-update-server-info
4848
git-upload-pack
4949
git-var

‎Documentation/diff-format.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
The output format from "git-diff-cache", "git-diff-tree" and
1+
The output format from "git-diff-index", "git-diff-tree" and
22
"git-diff-files" are very similar.
33

44
These commands all compare two sets of things; what are
55
compared are different:
66

7-
git-diff-cache <tree-ish>::
7+
git-diff-index <tree-ish>::
88
compares the <tree-ish> and the files on the filesystem.
99

10-
git-diff-cache --cached <tree-ish>::
10+
git-diff-index --cached <tree-ish>::
1111
compares the <tree-ish> and the cache.
1212

1313
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
@@ -58,7 +58,7 @@ Example:
5858
Generating patches with -p
5959
--------------------------
6060

61-
When "git-diff-cache", "git-diff-tree", or "git-diff-files" are run
61+
When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
6262
with a '-p' option, they do not produce the output described above;
6363
instead they produce a patch file.
6464

@@ -77,7 +77,7 @@ The "diff" formatting options can be customized via the
7777
environment variable 'GIT_DIFF_OPTS'. For example, if you
7878
prefer context diff:
7979

80-
GIT_DIFF_OPTS=-c git-diff-cache -p $(cat .git/HEAD)
80+
GIT_DIFF_OPTS=-c git-diff-index -p $(cat .git/HEAD)
8181

8282

8383
2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the

‎Documentation/diffcore.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ June 2005
66
Introduction
77
------------
88

9-
The diff commands git-diff-cache, git-diff-files, and
9+
The diff commands git-diff-index, git-diff-files, and
1010
git-diff-tree can be told to manipulate differences they find
1111
in unconventional ways before showing diff(1) output. The
1212
manipulation is collectively called "diffcore transformation".
@@ -21,7 +21,7 @@ The chain of operation
2121
The git-diff-* family works by first comparing two sets of
2222
files:
2323

24-
- git-diff-cache compares contents of a "tree" object and the
24+
- git-diff-index compares contents of a "tree" object and the
2525
working directory (when '--cached' flag is not used) or a
2626
"tree" object and the index file (when '--cached' flag is
2727
used);

Documentation/git-add-script.txt renamed to Documentation/git-add.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
git-add-script(1)
2-
=================
1+
git-add(1)
2+
==========
33

44
NAME
55
----
6-
git-add-script - Add files to the cache.
6+
git-add - Add files to the cache.
77

88
SYNOPSIS
99
--------
10-
'git-add-script' <file>...
10+
'git-add' <file>...
1111

1212
DESCRIPTION
1313
-----------
14-
A simple wrapper to git-update-cache to add files to the cache for people used
14+
A simple wrapper to git-update-index to add files to the cache for people used
1515
to do "cvs add".
1616

1717
OPTIONS

Documentation/git-archimport-script.txt renamed to Documentation/git-archimport.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
git-archimport-script(1)
2-
========================
1+
git-archimport(1)
2+
=================
33

44
NAME
55
----
6-
git-archimport-script - Import an arch repository into git
6+
git-archimport - Import an arch repository into git
77

88

99
SYNOPSIS
1010
--------
11-
`git-archimport-script` [--option...] <args>
11+
`git-archimport` [--option...] <args>
1212

1313
DESCRIPTION
1414
-----------

Documentation/git-bisect-script.txt renamed to Documentation/git-bisect.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
git-bisect-script(1)
2-
====================
1+
git-bisect(1)
2+
=============
33

44
NAME
55
----
6-
git-bisect-script - Find the change that introduced a bug
6+
git-bisect - Find the change that introduced a bug
77

88

99
SYNOPSIS

Documentation/git-branch-script.txt renamed to Documentation/git-branch.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
git-branch-script(1)
2-
====================
1+
git-branch(1)
2+
=============
33

44
NAME
55
----
6-
git-branch-script - Create a new branch.
6+
git-branch - Create a new branch.
77

88
SYNOPSIS
99
--------
10-
'git-branch-script' [<branchname> [start-point]]
10+
'git-branch' [<branchname> [start-point]]
1111

1212
DESCRIPTION
1313
-----------

Documentation/git-checkout-cache.txt renamed to Documentation/git-checkout-index.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
git-checkout-cache(1)
1+
git-checkout-index(1)
22
=====================
33
v0.1, May 2005
44

55
NAME
66
----
7-
git-checkout-cache - Copy files from the cache to the working directory
7+
git-checkout-index - Copy files from the cache to the working directory
88

99

1010
SYNOPSIS
1111
--------
12-
'git-checkout-cache' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
12+
'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
1313
[--] <file>...
1414

1515
DESCRIPTION
@@ -46,48 +46,48 @@ OPTIONS
4646

4747
Note that the order of the flags matters:
4848

49-
git-checkout-cache -a -f file.c
49+
git-checkout-index -a -f file.c
5050

5151
will first check out all files listed in the cache (but not overwrite
5252
any old ones), and then force-checkout `file.c` a second time (ie that
5353
one *will* overwrite any old contents with the same filename).
5454

55-
Also, just doing "git-checkout-cache" does nothing. You probably meant
56-
"git-checkout-cache -a". And if you want to force it, you want
57-
"git-checkout-cache -f -a".
55+
Also, just doing "git-checkout-index" does nothing. You probably meant
56+
"git-checkout-index -a". And if you want to force it, you want
57+
"git-checkout-index -f -a".
5858

5959
Intuitiveness is not the goal here. Repeatability is. The reason for
6060
the "no arguments means no work" thing is that from scripts you are
6161
supposed to be able to do things like:
6262

63-
find . -name '*.h' -print0 | xargs -0 git-checkout-cache -f --
63+
find . -name '*.h' -print0 | xargs -0 git-checkout-index -f --
6464

6565
which will force all existing `*.h` files to be replaced with their
6666
cached copies. If an empty command line implied "all", then this would
6767
force-refresh everything in the cache, which was not the point.
6868

6969
To update and refresh only the files already checked out:
7070

71-
git-checkout-cache -n -f -a && git-update-cache --ignore-missing --refresh
71+
git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh
7272

7373
Oh, and the "--" is just a good idea when you know the rest will be
7474
filenames. Just so that you wouldn't have a filename of "-a" causing
7575
problems (not possible in the above example, but get used to it in
7676
scripting!).
7777

7878
The prefix ability basically makes it trivial to use
79-
git-checkout-cache as an "export as tree" function. Just read the
79+
git-checkout-index as an "export as tree" function. Just read the
8080
desired tree into the index, and do a
8181

82-
git-checkout-cache --prefix=git-export-dir/ -a
82+
git-checkout-index --prefix=git-export-dir/ -a
8383

84-
and git-checkout-cache will "export" the cache into the specified
84+
and git-checkout-index will "export" the cache into the specified
8585
directory.
8686

8787
NOTE The final "/" is important. The exported name is literally just
8888
prefixed with the specified string, so you can also do something like
8989

90-
git-checkout-cache --prefix=.merged- Makefile
90+
git-checkout-index --prefix=.merged- Makefile
9191

9292
to check out the currently cached copy of `Makefile` into the file
9393
`.merged-Makefile`

Documentation/git-checkout-script.txt renamed to Documentation/git-checkout.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
git-checkout-script(1)
2-
======================
1+
git-checkout(1)
2+
===============
33

44
NAME
55
----
6-
git-checkout-script - Checkout and switch to a branch.
6+
git-checkout - Checkout and switch to a branch.
77

88
SYNOPSIS
99
--------
10-
'git-checkout-script' [-f] [-b <new_branch>] [<branch>]
10+
'git-checkout' [-f] [-b <new_branch>] [<branch>]
1111

1212
DESCRIPTION
1313
-----------

Documentation/git-cherry-pick-script.txt renamed to Documentation/git-cherry-pick.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
git-cherry-pick-script(1)
2-
=========================
1+
git-cherry-pick(1)
2+
==================
33
v0.99.5 Aug 2005
44

55
NAME
66
----
7-
git-cherry-pick-script - Apply the change introduced by an existing commit.
7+
git-cherry-pick - Apply the change introduced by an existing commit.
88

99
SYNOPSIS
1010
--------
11-
'git-cherry-pick-script' [-n] [-r] <commit>
11+
'git-cherry-pick' [-n] [-r] <commit>
1212

1313
DESCRIPTION
1414
-----------

0 commit comments

Comments
 (0)