Code

Add test cases for git-am
authorStephan Beyer <s-beyer@gmx.net>
Sat, 31 May 2008 22:11:42 +0000 (00:11 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 May 2008 22:42:12 +0000 (15:42 -0700)
commitd3a7b8f5c5ed2a073936e09aa80c8a0b0cf10f5c
tree032fdcd24a13e7b032ef5bd238539511bd5e9ae8
parentd2b3691b61d516a0ad2bf700a2a5d9113ceff0b1
Add test cases for git-am

Add t/t4151-am.sh that does basic testing of git-am functionality,
including:
 * am applies patch correctly
 * am changes committer and keeps author
 * am --signoff adds Signed-off-by: line
 * am stays in branch
 * am --signoff does not add Signed-off-by: line if already there
 * am without --keep removes Re: and [PATCH] stuff
 * am --keep really keeps the subject
 * am -3 falls back to 3-way merge
 * am pauses on conflict
 * am --skip works
 * am --resolved works
 * am takes patches from a Pine mailbox
 * am fails on mail without patch
 * am fails on empty patch

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4151-am.sh [new file with mode: 0755]