From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>, Paul Tan <pyokagan@gmail.com>
Subject: [PATCH v3 06/12] t4150: am --resolved fails if index has unmerged entries
Date: Sun, 19 Jul 2015 23:49:12 +0800 [thread overview]
Message-ID: <1437320958-11192-7-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1437320958-11192-1-git-send-email-pyokagan@gmail.com>
Since c1d1128 (git-am --resolved: more usable error message.,
2006-04-28), git-am --resolved will check to see if there are any
unmerged entries, and will error out with a user-friendly error message
if there are.
Add a test for this.
Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
t/t4150-am.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 430ae71..c1ec4d5 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -437,6 +437,19 @@ test_expect_success 'am --resolved fails if index has no changes' '
test_cmp_rev lorem2^^ HEAD
'
+test_expect_success 'am --resolved fails if index has unmerged entries' '
+ rm -fr .git/rebase-apply &&
+ git reset --hard &&
+ git checkout second &&
+ test_must_fail git am -3 lorem-move.patch &&
+ test_path_is_dir .git/rebase-apply &&
+ test_cmp_rev second HEAD &&
+ test_must_fail git am --resolved >err &&
+ test_path_is_dir .git/rebase-apply &&
+ test_cmp_rev second HEAD &&
+ test_i18ngrep "still have unmerged paths" err
+'
+
test_expect_success 'am takes patches from a Pine mailbox' '
rm -fr .git/rebase-apply &&
git reset --hard &&
--
2.5.0.rc2.110.gf2a5fc6
next prev parent reply other threads:[~2015-07-19 15:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-19 15:49 [PATCH v3 00/12] Improve git-am test coverage Paul Tan
2015-07-19 15:49 ` [PATCH v3 01/12] t4150: am.messageid really adds the message id Paul Tan
2015-07-19 15:49 ` [PATCH v3 02/12] t4150: am fails if index is dirty Paul Tan
2015-07-19 15:49 ` [PATCH v3 03/12] t4151: am --abort will keep dirty index intact Paul Tan
2015-07-19 15:49 ` [PATCH v3 04/12] t4150: am refuses patches when paused Paul Tan
2015-07-19 15:49 ` [PATCH v3 05/12] t4150: am --resolved fails if index has no changes Paul Tan
2015-07-19 15:49 ` Paul Tan [this message]
2015-07-19 15:49 ` [PATCH v3 07/12] t4150: am with applypatch-msg hook Paul Tan
2015-07-19 15:49 ` [PATCH v3 08/12] t4150: am with pre-applypatch hook Paul Tan
2015-07-19 15:49 ` [PATCH v3 09/12] t4150: am with post-applypatch hook Paul Tan
2015-07-19 15:49 ` [PATCH v3 10/12] t4150: tests for am --[no-]scissors Paul Tan
2015-07-19 15:49 ` [PATCH v3 11/12] t3418: non-interactive rebase --continue with rerere enabled Paul Tan
2015-07-19 15:49 ` [PATCH v3 12/12] t3901: test git-am encoding conversion Paul Tan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437320958-11192-7-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).