Skip to content

Commit

Permalink
am: remove support for -d .dotest
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Mar 5, 2008
1 parent bb034f8 commit e72c740
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
6 changes: 1 addition & 5 deletions Documentation/git-am.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ git-am - Apply a series of patches from a mailbox
SYNOPSIS
--------
[verse]
'git-am' [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
'git-am' [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--binary]
[--whitespace=<option>] [-C<n>] [-p<n>]
<mbox>|<Maildir>...
Expand All @@ -32,10 +32,6 @@ OPTIONS
Add `Signed-off-by:` line to the commit message, using
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::
Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).

Expand Down
14 changes: 5 additions & 9 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ git-am [options] <mbox>|<Maildir>...
git-am [options] --resolved
git-am [options] --skip
--
d,dotest= use <dir> and not .dotest
d,dotest= (removed -- do not use)
i,interactive run interactively
b,binary pass --allo-binary-replacement to git-apply
3,3way allow fall back on 3way merging if needed
Expand Down Expand Up @@ -50,10 +50,6 @@ stop_here_user_resolve () {
then
cmdline="$cmdline -3"
fi
if test '.dotest' != "$dotest"
then
cmdline="$cmdline -d=$dotest"
fi
echo "When you have resolved this problem run \"$cmdline --resolved\"."
echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."

Expand Down Expand Up @@ -125,7 +121,7 @@ reread_subject () {
}

prec=4
dotest="${prefix}.dotest"
dotest=".dotest"
sign= utf8=t keep= skip= interactive= resolved= binary=
resolvemsg= resume=
git_apply_opt=
Expand All @@ -152,8 +148,8 @@ do
--skip)
skip=t ;;
-d|--dotest)
shift
case "$1" in /*) dotest=$1;; *) dotest="$prefix$1" ;; esac ;;
die "-d option is no longer supported. Do not use."
;;
--resolvemsg)
shift; resolvemsg=$1 ;;
--whitespace)
Expand Down Expand Up @@ -189,7 +185,7 @@ then
0,)
# No file input but without resume parameters; catch
# 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
# and the caller did not intend to feed us a patch but
# wanted to continue unattended.
Expand Down

0 comments on commit e72c740

Please sign in to comment.