diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-04 00:25:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-05 10:52:56 -0800 |
| commit | e72c74062c01855372add133fe8dcc0bd22bad20 (patch) | |
| tree | 5df5bd3e62702294182908d81c5eb6d9a274f6f5 | |
| parent | bb034f839a396cf0660024a59bbff61f8ef0c5af (diff) | |
| download | git-e72c74062c01855372add133fe8dcc0bd22bad20.tar.gz git-e72c74062c01855372add133fe8dcc0bd22bad20.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-am.txt | 6 | ||||
| -rwxr-xr-x | git-am.sh | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index e640fc75c..2387a8d6c 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -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>... @@ -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]). @@ -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 @@ -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\"." @@ -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= @@ -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) @@ -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. |