Skip to content

Commit 59c8e2c

Browse files
author
Junio C Hamano
committed
Remove git-applypatch
The previous one removed git-applymbox, which was the sole user of this tool. Signed-off-by: Junio C Hamano <[email protected]>
1 parent d45cc6e commit 59c8e2c

File tree

9 files changed

+10
-280
lines changed

9 files changed

+10
-280
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ git-add--interactive
77
git-am
88
git-annotate
99
git-apply
10-
git-applypatch
1110
git-archimport
1211
git-archive
1312
git-bisect

Documentation/SubmittingPatches

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,15 @@ One test you could do yourself if your MUA is set up correctly is:
239239
$ git fetch http://kernel.org/pub/scm/git/git.git master:test-apply
240240
$ git checkout test-apply
241241
$ git reset --hard
242-
$ git applymbox a.patch
242+
$ git am a.patch
243243

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

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

250-
* Your MUA corrupted your patch; applymbox would complain that
250+
* Your MUA corrupted your patch; "am" would complain that
251251
the patch does not apply. Look at .dotest/ subdirectory and
252252
see what 'patch' file contains and check for the common
253253
corruption patterns mentioned above.

Documentation/cmd-list.perl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ sub format_one {
7272
git-add mainporcelain
7373
git-am mainporcelain
7474
git-annotate ancillaryinterrogators
75-
git-applypatch purehelpers
7675
git-apply plumbingmanipulators
7776
git-archimport foreignscminterface
7877
git-archive mainporcelain

Documentation/git-am.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ names.
145145

146146
SEE ALSO
147147
--------
148-
gitlink:git-applypatch[1], gitlink:git-apply[1].
148+
gitlink:git-apply[1].
149149

150150

151151
Author

Documentation/git-applypatch.txt

Lines changed: 0 additions & 53 deletions
This file was deleted.

Documentation/git-mailinfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DESCRIPTION
1616
Reading a single e-mail message from the standard input, and
1717
writes the commit log message in <msg> file, and the patches in
1818
<patch> file. The author name, e-mail and e-mail subject are
19-
written out to the standard output to be used by git-applypatch
19+
written out to the standard output to be used by git-am
2020
to create a commit. It is usually not necessary to use this
2121
command directly. See gitlink:git-am[1] instead.
2222

Documentation/hooks.txt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ This document describes the currently defined hooks.
1212
applypatch-msg
1313
--------------
1414

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

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

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

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

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

5451
pre-commit
5552
----------

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ SCRIPT_SH = \
206206
git-repack.sh git-request-pull.sh git-reset.sh \
207207
git-sh-setup.sh \
208208
git-tag.sh git-verify-tag.sh \
209-
git-applypatch.sh git-am.sh \
209+
git-am.sh \
210210
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
211211
git-merge-resolve.sh git-merge-ours.sh \
212212
git-lost-found.sh git-quiltimport.sh

git-applypatch.sh

Lines changed: 0 additions & 212 deletions
This file was deleted.

0 commit comments

Comments
 (0)