Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLukas Sandström <lukass@etek.chalmers.se>2006-07-20 00:28:00 +0400
committerJunio C Hamano <junkio@cox.net>2006-07-24 10:58:40 +0400
commitcbd64afbb3b1ad5433585ac71d94bd0c63270e38 (patch)
tree26a3920e6d13073474ec913dde1b75e63b6a8ba2 /diff.h
parentf8263c5339fd70ee00b60c37b715c7e46b30a3bf (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>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions