Permalink
Browse files

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>
  • Loading branch information...
Junio C Hamano
Junio C Hamano committed Sep 8, 2005
1 parent 99977bd commit 215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7
Showing with 1,023 additions and 915 deletions.
  1. +10 −10 .gitignore
  2. +5 −5 Documentation/diff-format.txt
  3. +2 −2 Documentation/diffcore.txt
  4. +5 −5 Documentation/{git-add-script.txt → git-add.txt}
  5. +4 −4 Documentation/{git-archimport-script.txt → git-archimport.txt}
  6. +3 −3 Documentation/{git-bisect-script.txt → git-bisect.txt}
  7. +4 −4 Documentation/{git-branch-script.txt → git-branch.txt}
  8. +13 −13 Documentation/{git-checkout-cache.txt → git-checkout-index.txt}
  9. +4 −4 Documentation/{git-checkout-script.txt → git-checkout.txt}
  10. +4 −4 Documentation/{git-cherry-pick-script.txt → git-cherry-pick.txt}
  11. +3 −3 Documentation/{git-clone-script.txt → git-clone.txt}
  12. +3 −3 Documentation/{git-commit-script.txt → git-commit.txt}
  13. +4 −4 Documentation/{git-convert-cache.txt → git-convert-objects.txt}
  14. +4 −4 Documentation/{git-count-objects-script.txt → git-count-objects.txt}
  15. +4 −4 Documentation/{git-cvsimport-script.txt → git-cvsimport.txt}
  16. +1 −1 Documentation/git-diff-files.txt
  17. +2 −2 Documentation/git-diff-helper.txt
  18. +13 −13 Documentation/{git-diff-cache.txt → git-diff-index.txt}
  19. +2 −2 Documentation/git-diff-tree.txt
  20. +4 −4 Documentation/{git-diff-script.txt → git-diff.txt}
  21. +4 −4 Documentation/{git-fetch-script.txt → git-fetch.txt}
  22. +4 −4 Documentation/{git-format-patch-script.txt → git-format-patch.txt}
  23. +8 −8 Documentation/{git-fsck-cache.txt → git-fsck-objects.txt}
  24. +1 −1 Documentation/git-hash-object.txt
  25. +4 −4 Documentation/{git-http-pull.txt → git-http-fetch.txt}
  26. +4 −4 Documentation/{git-local-pull.txt → git-local-fetch.txt}
  27. +3 −3 Documentation/{git-log-script.txt → git-log.txt}
  28. +3 −3 Documentation/{git-ls-remote-script.txt → git-ls-remote.txt}
  29. +9 −9 Documentation/{git-merge-cache.txt → git-merge-index.txt}
  30. +5 −5 Documentation/{git-merge-one-file-script.txt → git-merge-one-file.txt}
  31. +3 −3 Documentation/{git-octopus-script.txt → git-octopus.txt}
  32. +1 −1 Documentation/git-pack-objects.txt
  33. +4 −4 Documentation/{git-parse-remote-script.txt → git-parse-remote.txt}
  34. +1 −1 Documentation/git-prune-packed.txt
  35. +5 −5 Documentation/{git-prune-script.txt → git-prune.txt}
  36. +5 −5 Documentation/{git-pull-script.txt → git-pull.txt}
  37. +4 −4 Documentation/{git-push-script.txt → git-push.txt}
  38. +12 −12 Documentation/git-read-tree.txt
  39. +4 −4 Documentation/{git-rebase-script.txt → git-rebase.txt}
  40. +4 −4 Documentation/{git-relink-script.txt → git-relink.txt}
  41. +4 −4 Documentation/{git-rename-script.txt → git-rename.txt}
  42. +4 −4 Documentation/{git-repack-script.txt → git-repack.txt}
  43. +4 −4 Documentation/{git-request-pull-script.txt → git-request-pull.txt}
  44. +4 −4 Documentation/{git-reset-script.txt → git-reset.txt}
  45. +3 −3 Documentation/{git-resolve-script.txt → git-resolve.txt}
  46. +4 −4 Documentation/{git-revert-script.txt → git-revert.txt}
  47. +5 −5 Documentation/{git-send-email-script.txt → git-send-email.txt}
  48. +5 −5 Documentation/{git-sh-setup-script.txt → git-sh-setup.txt}
  49. +1 −1 Documentation/git-show-branch.txt
  50. +6 −6 Documentation/{git-ssh-pull.txt → git-ssh-fetch.txt}
  51. +6 −6 Documentation/{git-ssh-push.txt → git-ssh-upload.txt}
  52. +4 −4 Documentation/{git-status-script.txt → git-status.txt}
  53. +4 −4 Documentation/{git-tag-script.txt → git-tag.txt}
  54. +7 −7 Documentation/{git-update-cache.txt → git-update-index.txt}
  55. +1 −1 Documentation/git-var.txt
  56. +5 −5 Documentation/{git-verify-tag-script.txt → git-verify-tag.txt}
  57. +1 −1 Documentation/git-write-tree.txt
  58. +95 −51 Documentation/git.txt
  59. +6 −6 Documentation/hooks.txt
  60. +1 −1 Documentation/howto/make-dist.txt
  61. +1 −1 Documentation/howto/rebase-from-internal-branch.txt
  62. +2 −2 Documentation/howto/revert-branch-rebase.txt
  63. +27 −27 Documentation/tutorial.txt
  64. +3 −3 INSTALL
  65. +77 −75 Makefile
  66. +13 −13 README
  67. +7 −7 checkout-cache.c → checkout-index.c
  68. +53 −0 cmd-rename.sh
  69. +1 −1 convert-cache.c → convert-objects.c
  70. +1 −1 debian/changelog
  71. +1 −1 diff-cache.c → diff-index.c
  72. +6 −6 entry.c
  73. +1 −1 pull.c → fetch.c
  74. 0 pull.h → fetch.h
  75. +6 −6 fsck-cache.c → fsck-objects.c
  76. +0 −20 git
  77. +0 −2 git-add-script
  78. +2 −0 git-add.sh
  79. +2 −2 git-applymbox → git-applymbox.sh
  80. +1 −1 git-applypatch → git-applypatch.sh
  81. +14 −14 git-archimport-script → git-archimport.perl
  82. +1 −1 git-bisect-script → git-bisect.sh
  83. +1 −1 git-branch-script → git-branch.sh
  84. +2 −2 git-checkout-script → git-checkout.sh
  85. +1 −1 git-cherry → git-cherry.sh
  86. +1 −1 git-clone-script → git-clone.sh
  87. +6 −6 git-commit-script → git-commit.sh
  88. +1 −1 git-count-objects-script → git-count-objects.sh
  89. +2 −2 git-cvsimport-script → git-cvsimport.perl
  90. +1 −1 git-diff-script → git-diff.sh
  91. +3 −3 git-fetch-script → git-fetch.sh
  92. +1 −1 git-format-patch-script → git-format-patch.sh
  93. 0 git-log-script → git-log.sh
  94. +2 −2 git-ls-remote-script → git-ls-remote.sh
  95. +8 −8 git-merge-one-file-script → git-merge-one-file.sh
  96. +5 −5 git-octopus-script → git-octopus.sh
  97. +1 −1 git-parse-remote-script → git-parse-remote.sh
  98. +3 −3 git-prune-script → git-prune.sh
  99. +4 −4 git-pull-script → git-pull.sh
  100. +2 −2 git-push-script → git-push.sh
  101. +6 −6 git-rebase-script → git-rebase.sh
  102. 0 git-relink-script → git-relink.perl
  103. +4 −4 git-rename-script → git-rename.perl
  104. +1 −1 git-repack-script → git-repack.sh
  105. 0 git-request-pull-script → git-request-pull.sh
  106. +3 −3 git-reset-script → git-reset.sh
  107. +4 −4 git-resolve-script → git-resolve.sh
  108. +7 −5 git-revert-script → git-revert.sh
  109. +2 −2 git-send-email-script → git-send-email.perl
  110. +2 −2 git-sh-setup-script → git-sh-setup.sh
  111. 0 git-shortlog → git-shortlog.perl
  112. +4 −4 git-status-script → git-status.sh
  113. +2 −2 git-tag-script → git-tag.sh
  114. +1 −1 git-verify-tag-script → git-verify-tag.sh
  115. 0 git-whatchanged → git-whatchanged.sh
  116. +27 −0 git.sh
  117. +2 −2 http-pull.c → http-fetch.c
  118. +2 −2 local-pull.c → local-fetch.c
  119. +4 −4 merge-cache.c → merge-index.c
  120. +3 −3 ssh-pull.c → ssh-fetch.c
  121. +5 −5 ssh-push.c → ssh-upload.c
  122. +5 −5 t/README
  123. +22 −22 t/lib-read-tree-m-3way.sh
  124. +13 −13 t/t0000-basic.sh
  125. +1 −1 t/t0100-environment-names.sh
  126. +2 −2 t/t0110-environment-names-old.sh
  127. +37 −37 t/t1000-read-tree-m-3way.sh
  128. +43 −43 t/t1001-read-tree-m-2way.sh
  129. +23 −23 t/t1002-read-tree-m-u-2way.sh
  130. +46 −46 t/t1005-read-tree-m-2way-emu23.sh
  131. +9 −9 t/t2000-checkout-cache-clash.sh
  132. +9 −9 t/t2001-checkout-cache-clash.sh
  133. +8 −8 t/t2002-checkout-cache-u.sh
  134. +9 −9 t/t2003-checkout-cache-mkdir.sh
  135. +6 −6 t/t2100-update-cache-badpath.sh
  136. +2 −2 t/t3010-ls-files-killed.sh
  137. +1 −1 t/t3100-ls-tree-restrict.sh
  138. +1 −1 t/t4000-diff-format.sh
  139. +4 −4 t/t4001-diff-rename.sh
  140. +9 −9 t/t4002-diff-basic.sh
  141. +8 −8 t/t4003-diff-rename-1.sh
  142. +3 −3 t/t4004-diff-rename-symlink.sh
  143. +7 −7 t/t4005-diff-rename-2.sh
  144. +3 −3 t/t4006-diff-mode.sh
  145. +7 −7 t/t4007-rename-3.sh
  146. +16 −16 t/t4008-diff-break-rewrite.sh
  147. +7 −7 t/t4009-diff-rename-4.sh
  148. +7 −7 t/t4010-diff-pathspec.sh
  149. +1 −1 t/t4102-apply-rename.sh
  150. +1 −1 t/t4112-apply-renames.sh
  151. +2 −2 t/t5000-tar-tree.sh
  152. +2 −2 t/t5300-pack-object.sh
  153. +3 −3 t/t5400-send-pack.sh
  154. +1 −1 t/t6001-rev-list-merge-order.sh
  155. +1 −1 t/t6002-rev-list-bisect.sh
  156. +1 −1 t/t6003-rev-list-topo-order.sh
  157. +1 −1 t/t6101-rev-parse-parents.sh
  158. +1 −1 templates/hooks--commit-msg
  159. +2 −2 templates/hooks--pre-commit
  160. +5 −5 update-cache.c → update-index.c
View
@@ -1,28 +1,28 @@
git-apply
git-build-rev-cache
git-cat-file
-git-checkout-cache
+git-checkout-index
git-clone-pack
git-commit-tree
-git-convert-cache
+git-convert-objects
git-daemon
-git-diff-cache
+git-diff-index
git-diff-files
git-diff-helper
git-diff-stages
git-diff-tree
git-export
git-fetch-pack
-git-fsck-cache
+git-fsck-objects
git-get-tar-commit-id
git-hash-object
-git-http-pull
+git-http-fetch
git-init-db
-git-local-pull
+git-local-fetch
git-ls-files
git-ls-tree
git-merge-base
-git-merge-cache
+git-merge-index
git-mktag
git-pack-objects
git-patch-id
@@ -37,13 +37,13 @@ git-send-pack
git-show-branch
git-show-index
git-show-rev-cache
-git-ssh-pull
-git-ssh-push
+git-ssh-fetch
+git-ssh-upload
git-stripspace
git-tar-tree
git-unpack-file
git-unpack-objects
-git-update-cache
+git-update-index
git-update-server-info
git-upload-pack
git-var
@@ -1,13 +1,13 @@
-The output format from "git-diff-cache", "git-diff-tree" and
+The output format from "git-diff-index", "git-diff-tree" and
"git-diff-files" are very similar.
These commands all compare two sets of things; what are
compared are different:
-git-diff-cache <tree-ish>::
+git-diff-index <tree-ish>::
compares the <tree-ish> and the files on the filesystem.
-git-diff-cache --cached <tree-ish>::
+git-diff-index --cached <tree-ish>::
compares the <tree-ish> and the cache.
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
@@ -58,7 +58,7 @@ Example:
Generating patches with -p
--------------------------
-When "git-diff-cache", "git-diff-tree", or "git-diff-files" are run
+When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
with a '-p' option, they do not produce the output described above;
instead they produce a patch file.
@@ -77,7 +77,7 @@ The "diff" formatting options can be customized via the
environment variable 'GIT_DIFF_OPTS'. For example, if you
prefer context diff:
- GIT_DIFF_OPTS=-c git-diff-cache -p $(cat .git/HEAD)
+ GIT_DIFF_OPTS=-c git-diff-index -p $(cat .git/HEAD)
2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
@@ -6,7 +6,7 @@ June 2005
Introduction
------------
-The diff commands git-diff-cache, git-diff-files, and
+The diff commands git-diff-index, git-diff-files, and
git-diff-tree can be told to manipulate differences they find
in unconventional ways before showing diff(1) output. The
manipulation is collectively called "diffcore transformation".
@@ -21,7 +21,7 @@ The chain of operation
The git-diff-* family works by first comparing two sets of
files:
- - git-diff-cache compares contents of a "tree" object and the
+ - git-diff-index compares contents of a "tree" object and the
working directory (when '--cached' flag is not used) or a
"tree" object and the index file (when '--cached' flag is
used);
@@ -1,17 +1,17 @@
-git-add-script(1)
-=================
+git-add(1)
+==========
NAME
----
-git-add-script - Add files to the cache.
+git-add - Add files to the cache.
SYNOPSIS
--------
-'git-add-script' <file>...
+'git-add' <file>...
DESCRIPTION
-----------
-A simple wrapper to git-update-cache to add files to the cache for people used
+A simple wrapper to git-update-index to add files to the cache for people used
to do "cvs add".
OPTIONS
@@ -1,14 +1,14 @@
-git-archimport-script(1)
-========================
+git-archimport(1)
+=================
NAME
----
-git-archimport-script - Import an arch repository into git
+git-archimport - Import an arch repository into git
SYNOPSIS
--------
-`git-archimport-script` [--option...] <args>
+`git-archimport` [--option...] <args>
DESCRIPTION
-----------
@@ -1,9 +1,9 @@
-git-bisect-script(1)
-====================
+git-bisect(1)
+=============
NAME
----
-git-bisect-script - Find the change that introduced a bug
+git-bisect - Find the change that introduced a bug
SYNOPSIS
@@ -1,13 +1,13 @@
-git-branch-script(1)
-====================
+git-branch(1)
+=============
NAME
----
-git-branch-script - Create a new branch.
+git-branch - Create a new branch.
SYNOPSIS
--------
-'git-branch-script' [<branchname> [start-point]]
+'git-branch' [<branchname> [start-point]]
DESCRIPTION
-----------
@@ -1,15 +1,15 @@
-git-checkout-cache(1)
+git-checkout-index(1)
=====================
v0.1, May 2005
NAME
----
-git-checkout-cache - Copy files from the cache to the working directory
+git-checkout-index - Copy files from the cache to the working directory
SYNOPSIS
--------
-'git-checkout-cache' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
+'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
[--] <file>...
DESCRIPTION
@@ -46,48 +46,48 @@ OPTIONS
Note that the order of the flags matters:
- git-checkout-cache -a -f file.c
+ git-checkout-index -a -f file.c
will first check out all files listed in the cache (but not overwrite
any old ones), and then force-checkout `file.c` a second time (ie that
one *will* overwrite any old contents with the same filename).
-Also, just doing "git-checkout-cache" does nothing. You probably meant
-"git-checkout-cache -a". And if you want to force it, you want
-"git-checkout-cache -f -a".
+Also, just doing "git-checkout-index" does nothing. You probably meant
+"git-checkout-index -a". And if you want to force it, you want
+"git-checkout-index -f -a".
Intuitiveness is not the goal here. Repeatability is. The reason for
the "no arguments means no work" thing is that from scripts you are
supposed to be able to do things like:
- find . -name '*.h' -print0 | xargs -0 git-checkout-cache -f --
+ find . -name '*.h' -print0 | xargs -0 git-checkout-index -f --
which will force all existing `*.h` files to be replaced with their
cached copies. If an empty command line implied "all", then this would
force-refresh everything in the cache, which was not the point.
To update and refresh only the files already checked out:
- git-checkout-cache -n -f -a && git-update-cache --ignore-missing --refresh
+ git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh
Oh, and the "--" is just a good idea when you know the rest will be
filenames. Just so that you wouldn't have a filename of "-a" causing
problems (not possible in the above example, but get used to it in
scripting!).
The prefix ability basically makes it trivial to use
-git-checkout-cache as an "export as tree" function. Just read the
+git-checkout-index as an "export as tree" function. Just read the
desired tree into the index, and do a
- git-checkout-cache --prefix=git-export-dir/ -a
+ git-checkout-index --prefix=git-export-dir/ -a
-and git-checkout-cache will "export" the cache into the specified
+and git-checkout-index will "export" the cache into the specified
directory.
NOTE The final "/" is important. The exported name is literally just
prefixed with the specified string, so you can also do something like
- git-checkout-cache --prefix=.merged- Makefile
+ git-checkout-index --prefix=.merged- Makefile
to check out the currently cached copy of `Makefile` into the file
`.merged-Makefile`
@@ -1,13 +1,13 @@
-git-checkout-script(1)
-======================
+git-checkout(1)
+===============
NAME
----
-git-checkout-script - Checkout and switch to a branch.
+git-checkout - Checkout and switch to a branch.
SYNOPSIS
--------
-'git-checkout-script' [-f] [-b <new_branch>] [<branch>]
+'git-checkout' [-f] [-b <new_branch>] [<branch>]
DESCRIPTION
-----------
@@ -1,14 +1,14 @@
-git-cherry-pick-script(1)
-=========================
+git-cherry-pick(1)
+==================
v0.99.5 Aug 2005
NAME
----
-git-cherry-pick-script - Apply the change introduced by an existing commit.
+git-cherry-pick - Apply the change introduced by an existing commit.
SYNOPSIS
--------
-'git-cherry-pick-script' [-n] [-r] <commit>
+'git-cherry-pick' [-n] [-r] <commit>
DESCRIPTION
-----------
@@ -1,10 +1,10 @@
-git-clone-script(1)
-===================
+git-clone(1)
+============
v0.1, July 2005
NAME
----
-git-clone-script - Clones a repository.
+git-clone - Clones a repository.
SYNOPSIS
@@ -1,10 +1,10 @@
-git-commit-script(1)
-====================
+git-commit(1)
+=============
v0.99.4, Aug 2005
NAME
----
-git-commit-script - Record your changes
+git-commit - Record your changes
SYNOPSIS
--------
@@ -1,15 +1,15 @@
-git-convert-cache(1)
-====================
+git-convert-objects(1)
+======================
v0.1, May 2005
NAME
----
-git-convert-cache - Converts old-style GIT repository
+git-convert-objects - Converts old-style GIT repository
SYNOPSIS
--------
-'git-convert-cache'
+'git-convert-objects'
DESCRIPTION
-----------
@@ -1,13 +1,13 @@
-git-count-objects-script(1)
-===========================
+git-count-objects(1)
+====================
NAME
----
-git-count-objects-script - Reports on unpacked objects.
+git-count-objects - Reports on unpacked objects.
SYNOPSIS
--------
-'git-count-objects-script'
+'git-count-objects'
DESCRIPTION
-----------
@@ -1,15 +1,15 @@
-git-cvsimport-script(1)
-=======================
+git-cvsimport(1)
+================
v0.1, July 2005
NAME
----
-git-cvsimport-script - Import a CVS repository into git
+git-cvsimport - Import a CVS repository into git
SYNOPSIS
--------
-'git-cvsimport-script' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
+'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
[ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
[ -C <GIT_repository> ] [ -i ] [ -k ]
[ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
@@ -16,7 +16,7 @@ DESCRIPTION
Compares the files in the working tree and the cache. When paths
are specified, compares only those named paths. Otherwise all
entries in the cache are compared. The output format is the
-same as "git-diff-cache" and "git-diff-tree".
+same as "git-diff-index" and "git-diff-tree".
OPTIONS
-------
Oops, something went wrong.

0 comments on commit 215a7ad

Please sign in to comment.