summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Lukas Sandström <lukass@etek.chalmers.se>2006-07-19 22:28:00 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-23 23:58:40 -0700
commitcbd64afbb3b1ad5433585ac71d94bd0c63270e38 (patch)
tree26a3920e6d13073474ec913dde1b75e63b6a8ba2
parentshow-branch: Fix another performance problem. (diff)
downloadtgif-cbd64afbb3b1ad5433585ac71d94bd0c63270e38.tar.xz
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-xgit-am.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 3a129e0021..04f0119435 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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