undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am: remove support for -d .dotest

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2008-03-04 00:25:05 -08:00
parent bb034f839a
commit e72c74062c
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-am.txt
View File

@ -9,7 +9,7 @@ git-am - Apply a series of patches from a mailbox
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git-am' [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8] 'git-am' [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--binary] [--3way] [--interactive] [--binary]
[--whitespace=<option>] [-C<n>] [-p<n>] [--whitespace=<option>] [-C<n>] [-p<n>]
<mbox>|<Maildir>... <mbox>|<Maildir>...
@ -32,10 +32,6 @@ OPTIONS
Add `Signed-off-by:` line to the commit message, using Add `Signed-off-by:` line to the commit message, using
the committer identity of yourself. the committer identity of yourself.
-d=<dir>, --dotest=<dir>::
Instead of `.dotest` directory, use <dir> as a working
area to store extracted patches.
-k, --keep:: -k, --keep::
Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).

14
git-am.sh
View File

@ -9,7 +9,7 @@ git-am [options] <mbox>|<Maildir>...
git-am [options] --resolved git-am [options] --resolved
git-am [options] --skip git-am [options] --skip
-- --
d,dotest= use <dir> and not .dotest d,dotest= (removed -- do not use)
i,interactive run interactively i,interactive run interactively
b,binary pass --allo-binary-replacement to git-apply b,binary pass --allo-binary-replacement to git-apply
3,3way allow fall back on 3way merging if needed 3,3way allow fall back on 3way merging if needed
@ -50,10 +50,6 @@ stop_here_user_resolve () {
then then
cmdline="$cmdline -3" cmdline="$cmdline -3"
fi fi
if test '.dotest' != "$dotest"
then
cmdline="$cmdline -d=$dotest"
fi
echo "When you have resolved this problem run \"$cmdline --resolved\"." echo "When you have resolved this problem run \"$cmdline --resolved\"."
echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"." echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
@ -125,7 +121,7 @@ reread_subject () {
} }
prec=4 prec=4
dotest="${prefix}.dotest" dotest=".dotest"
sign= utf8=t keep= skip= interactive= resolved= binary= sign= utf8=t keep= skip= interactive= resolved= binary=
resolvemsg= resume= resolvemsg= resume=
git_apply_opt= git_apply_opt=
@ -152,8 +148,8 @@ do
--skip) --skip)
skip=t ;; skip=t ;;
-d|--dotest) -d|--dotest)
shift die "-d option is no longer supported. Do not use."
case "$1" in /*) dotest=$1;; *) dotest="$prefix$1" ;; esac ;; ;;
--resolvemsg) --resolvemsg)
shift; resolvemsg=$1 ;; shift; resolvemsg=$1 ;;
--whitespace) --whitespace)
@ -189,7 +185,7 @@ then
0,) 0,)
# No file input but without resume parameters; catch # No file input but without resume parameters; catch
# user error to feed us a patch from standard input # user error to feed us a patch from standard input
# when there is already .dotest. This is somewhat # when there is already $dotest. This is somewhat
# unreliable -- stdin could be /dev/null for example # unreliable -- stdin could be /dev/null for example
# and the caller did not intend to feed us a patch but # and the caller did not intend to feed us a patch but
# wanted to continue unattended. # wanted to continue unattended.