diff options
author | Lukas Sandström <lukass@etek.chalmers.se> | 2006-07-20 00:28:00 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-24 10:58:40 +0400 |
commit | cbd64afbb3b1ad5433585ac71d94bd0c63270e38 (patch) | |
tree | 26a3920e6d13073474ec913dde1b75e63b6a8ba2 | |
parent | f8263c5339fd70ee00b60c37b715c7e46b30a3bf (diff) |
git-am: Don't accept an mbox on stdin of we already have a .dotest directory
It makes no sense to accept an mbox via stdin when we
won't accept it on the commandline.
The patch helps the following scenario:
# git init-db
"add file1 with content"
# git checkout -b apply
"edit file1 && commit"
# git checkout -b conflict master
"edit file1 && commit"
# git checkout -b ok master
"add file2"
# git checkout apply
# git format-patch -k -3 master..conflict | git am -k -3
=> git-am fails with a conflict message
# git reset --hard
# git format-patch -k -3 master..ok | git am -k -3
=> git am fails with the same conflict message as above,
=> since it's trying to apply the old .dotest directory
With the patch it complains about an old .dotest
directory instead.
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-x | git-am.sh | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -156,8 +156,10 @@ fi if test -d "$dotest" then - test ",$#," = ",0," || - die "previous dotest directory $dotest still exists but mbox given." + if test ",$#," != ",0," || ! tty -s + then + die "previous dotest directory $dotest still exists but mbox given." + fi resume=yes else # Make sure we are not given --skip nor --resolved |