am: remove support for -d .dotest
It has been supported for a long time, but I do not think this feature has been in use in the real world at all. We would eventually move this out of the toplevel of the work tree and to somewhere under $GIT_DIR, so let's remove the command line option to specify the location now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 4, 2008 at 00:25 UTC
e72c74062c01855372add133fe8dcc0bd22bad20
2 files changed
+6
-14
Documentation/git-am.txt
+1
-5
@@ -9,7 +9,7 @@ git-am - Apply a series of patches from a mailbox
9
SYNOPSIS
10
--------
11
[verse]
12
-'git-am' [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
12
+'git-am' [--signoff] [--keep] [--utf8 | --no-utf8]
13
[--3way] [--interactive] [--binary]
14
[--whitespace=<option>] [-C<n>] [-p<n>]
15
<mbox>|<Maildir>...
@@ -32,10 +32,6 @@ OPTIONS
32
Add `Signed-off-by:` line to the commit message, using
33
the committer identity of yourself.
34
35
--d=<dir>, --dotest=<dir>::
36
- Instead of `.dotest` directory, use <dir> as a working
37
- area to store extracted patches.
38
-
35
-k, --keep::
36
Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
37
git-am.sh
+5
-9
@@ -9,7 +9,7 @@ git-am [options] <mbox>|<Maildir>...
9
git-am [options] --resolved
10
git-am [options] --skip
11
--
12
-d,dotest= use <dir> and not .dotest
12
+d,dotest= (removed -- do not use)
13
i,interactive run interactively
14
b,binary pass --allo-binary-replacement to git-apply
15
3,3way allow fall back on 3way merging if needed
@@ -50,10 +50,6 @@ stop_here_user_resolve () {
50
then
51
cmdline="$cmdline -3"
52
fi
53
- if test '.dotest' != "$dotest"
54
- then
55
- cmdline="$cmdline -d=$dotest"
56
- fi
53
echo "When you have resolved this problem run \"$cmdline --resolved\"."
54
echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
55
@@ -125,7 +121,7 @@ reread_subject () {
121
}
122
123
prec=4
128
-dotest="${prefix}.dotest"
124
+dotest=".dotest"
125
sign= utf8=t keep= skip= interactive= resolved= binary=
126
resolvemsg= resume=
127
git_apply_opt=
@@ -152,8 +148,8 @@ do
148
--skip)
149
skip=t ;;
150
-d|--dotest)
155
- shift
156
- case "$1" in /*) dotest=$1;; *) dotest="$prefix$1" ;; esac ;;
151
+ die "-d option is no longer supported. Do not use."
152
+ ;;
153
--resolvemsg)
154
shift; resolvemsg=$1 ;;
155
--whitespace)
@@ -189,7 +185,7 @@ then
185
0,)
186
# No file input but without resume parameters; catch
187
# user error to feed us a patch from standard input
192
- # when there is already .dotest. This is somewhat
188
+ # when there is already $dotest. This is somewhat
189
# unreliable -- stdin could be /dev/null for example
190
# and the caller did not intend to feed us a patch but
191
# wanted to continue unattended.