From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v3 2/2] merge: add --quit
Date: Wed, 15 May 2019 11:52:00 +0900 [thread overview]
Message-ID: <xmqqpnok77lb.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190514091322.12427-3-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Tue, 14 May 2019 16:13:22 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
> index 106148254d..d453710ef6 100755
> --- a/t/t7600-merge.sh
> +++ b/t/t7600-merge.sh
> @@ -822,4 +822,18 @@ test_expect_success EXECKEEPSPID 'killed merge can be completed with --continue'
> verify_parents $c0 $c1
> '
>
> +test_expect_success 'merge --quit' '
> + git reset --hard c2 &&
> + test_must_fail git -c rerere.enabled=true merge master &&
> + test_path_is_file .git/MERGE_HEAD &&
> + test_path_is_file .git/MERGE_MODE &&
> + test_path_is_file .git/MERGE_MSG &&
> + test_path_is_file .git/MERGE_RR &&
> + git merge --quit &&
> + test_path_is_missing .git/MERGE_HEAD &&
> + test_path_is_missing .git/MERGE_MODE &&
> + test_path_is_missing .git/MERGE_MSG &&
> + test_path_is_missing .git/MERGE_RR
> +'
I'd appreciate to see test_when_finished used in this test so that
later tests, possibly added by another topic in parallel, would
start in a more-or-less reasonable state.
next prev parent reply other threads:[~2019-05-15 2:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-01 13:11 [PATCH 0/2] Add "git merge --quit" Nguyễn Thái Ngọc Duy
2019-05-01 13:11 ` [PATCH 1/2] merge: remove drop_save() in favor of remove_merge_branch_state() Nguyễn Thái Ngọc Duy
2019-05-01 13:11 ` [PATCH 2/2] merge: add --quit Nguyễn Thái Ngọc Duy
2019-05-02 21:49 ` Emily Shaffer
2019-05-02 10:13 ` [PATCH 0/2] Add "git merge --quit" Phillip Wood
2019-05-09 10:10 ` [PATCH v2 0/2] nd/merge-quit update Nguyễn Thái Ngọc Duy
2019-05-09 10:10 ` [PATCH v2 1/2] merge: remove drop_save() in favor of remove_merge_branch_state() Nguyễn Thái Ngọc Duy
2019-05-09 10:10 ` [PATCH v2 2/2] merge: add --quit Nguyễn Thái Ngọc Duy
2019-05-14 9:13 ` [PATCH v3 0/2] nd/merge-quit updates Nguyễn Thái Ngọc Duy
2019-05-14 9:13 ` [PATCH v3 1/2] merge: remove drop_save() in favor of remove_merge_branch_state() Nguyễn Thái Ngọc Duy
2019-05-14 9:13 ` [PATCH v3 2/2] merge: add --quit Nguyễn Thái Ngọc Duy
2019-05-14 13:44 ` Johannes Schindelin
2019-05-15 2:58 ` Junio C Hamano
2019-05-15 15:00 ` Johannes Schindelin
2019-05-15 2:52 ` Junio C Hamano [this message]
2019-05-18 11:30 ` [PATCH v4 0/2] nd/merge-quit updates Nguyễn Thái Ngọc Duy
2019-05-18 11:30 ` [PATCH v4 1/2] merge: remove drop_save() in favor of remove_merge_branch_state() Nguyễn Thái Ngọc Duy
2019-05-18 11:30 ` [PATCH v4 2/2] merge: add --quit Nguyễn Thái Ngọc Duy
2019-05-20 18:05 ` Johannes Schindelin
2019-05-20 17:01 ` [PATCH v4 0/2] nd/merge-quit updates Johannes Schindelin
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=xmqqpnok77lb.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.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).