From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: pclouds@gmail.com
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH v3 0/2] nd/merge-quit updates
Date: Tue, 14 May 2019 16:13:20 +0700 [thread overview]
Message-ID: <20190514091322.12427-1-pclouds@gmail.com> (raw)
In-Reply-To: <20190509101028.24656-1-pclouds@gmail.com>
v3 fixes the test breakage when GPG tests are skipped ('side' branch is
affected by these skipped tests)
Nguyễn Thái Ngọc Duy (2):
merge: remove drop_save() in favor of remove_merge_branch_state()
merge: add --quit
Documentation/git-merge.txt | 4 ++++
branch.c | 11 ++++++++---
branch.h | 6 ++++++
builtin/merge.c | 30 ++++++++++++++++++------------
t/t7600-merge.sh | 14 ++++++++++++++
5 files changed, 50 insertions(+), 15 deletions(-)
Range-diff dựa trên v2:
1: 324d237f0c ! 1: 86dd0fd99c merge: add --quit
@@ -13,7 +13,6 @@
different UI).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
--- a/Documentation/git-merge.txt
@@ -76,7 +75,7 @@
'
+test_expect_success 'merge --quit' '
-+ git reset --hard side &&
++ 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 &&
--
2.21.0.1141.gd54ac2cb17
next prev parent reply other threads:[~2019-05-14 9:13 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 ` Nguyễn Thái Ngọc Duy [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190514091322.12427-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.