Skip to content

Commit

Permalink
Remove git-applypatch
Browse files Browse the repository at this point in the history
The previous one removed git-applymbox, which was the sole user
of this tool.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed May 25, 2007
1 parent d45cc6e commit 59c8e2c
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 280 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ git-add--interactive
git-am
git-annotate
git-apply
git-applypatch
git-archimport
git-archive
git-bisect
Expand Down
4 changes: 2 additions & 2 deletions Documentation/SubmittingPatches
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,15 @@ One test you could do yourself if your MUA is set up correctly is:
$ git fetch http://kernel.org/pub/scm/git/git.git master:test-apply
$ git checkout test-apply
$ git reset --hard
$ git applymbox a.patch
$ git am a.patch

If it does not apply correctly, there can be various reasons.

* Your patch itself does not apply cleanly. That is _bad_ but
does not have much to do with your MUA. Please rebase the
patch appropriately.

* Your MUA corrupted your patch; applymbox would complain that
* Your MUA corrupted your patch; "am" would complain that
the patch does not apply. Look at .dotest/ subdirectory and
see what 'patch' file contains and check for the common
corruption patterns mentioned above.
Expand Down
1 change: 0 additions & 1 deletion Documentation/cmd-list.perl
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ sub format_one {
git-add mainporcelain
git-am mainporcelain
git-annotate ancillaryinterrogators
git-applypatch purehelpers
git-apply plumbingmanipulators
git-archimport foreignscminterface
git-archive mainporcelain
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-am.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ names.

SEE ALSO
--------
gitlink:git-applypatch[1], gitlink:git-apply[1].
gitlink:git-apply[1].


Author
Expand Down
53 changes: 0 additions & 53 deletions Documentation/git-applypatch.txt

This file was deleted.

2 changes: 1 addition & 1 deletion Documentation/git-mailinfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ DESCRIPTION
Reading a single e-mail message from the standard input, and
writes the commit log message in <msg> file, and the patches in
<patch> file. The author name, e-mail and e-mail subject are
written out to the standard output to be used by git-applypatch
written out to the standard output to be used by git-am
to create a commit. It is usually not necessary to use this
command directly. See gitlink:git-am[1] instead.

Expand Down
13 changes: 5 additions & 8 deletions Documentation/hooks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ This document describes the currently defined hooks.
applypatch-msg
--------------

This hook is invoked by `git-applypatch` script, which is
typically invoked by `git-am`. It takes a single
This hook is invoked by `git-am` script. It takes a single
parameter, the name of the file that holds the proposed commit
log message. Exiting with non-zero status causes
`git-applypatch` to abort before applying the patch.
`git-am` to abort before applying the patch.

The hook is allowed to edit the message file in place, and can
be used to normalize the message into some project standard
Expand All @@ -29,8 +28,7 @@ The default 'applypatch-msg' hook, when enabled, runs the
pre-applypatch
--------------

This hook is invoked by `git-applypatch` script, which is
typically invoked by `git-am`. It takes no parameter,
This hook is invoked by `git-am`. It takes no parameter,
and is invoked after the patch is applied, but before a commit
is made. Exiting with non-zero status causes the working tree
after application of the patch not committed.
Expand All @@ -44,12 +42,11 @@ The default 'pre-applypatch' hook, when enabled, runs the
post-applypatch
---------------

This hook is invoked by `git-applypatch` script, which is
typically invoked by `git-am`. It takes no parameter,
This hook is invoked by `git-am`. It takes no parameter,
and is invoked after the patch is applied and a commit is made.

This hook is meant primarily for notification, and cannot affect
the outcome of `git-applypatch`.
the outcome of `git-am`.

pre-commit
----------
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ SCRIPT_SH = \
git-repack.sh git-request-pull.sh git-reset.sh \
git-sh-setup.sh \
git-tag.sh git-verify-tag.sh \
git-applypatch.sh git-am.sh \
git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
git-merge-resolve.sh git-merge-ours.sh \
git-lost-found.sh git-quiltimport.sh
Expand Down
212 changes: 0 additions & 212 deletions git-applypatch.sh

This file was deleted.

0 comments on commit 59c8e2c

Please sign in to comment.