From: Stephan Beyer <s-beyer@gmx.net>
Date: Sat, 31 May 2008 22:11:42 +0000 (+0200)
Subject: Add test cases for git-am
X-Git-Tag: v1.5.6-rc1~6^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d3a7b8f5c5ed2a073936e09aa80c8a0b0cf10f5c?hp=d3a7b8f5c5ed2a073936e09aa80c8a0b0cf10f5c

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>
---