From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, sbeller@google.com, Elijah Newren <newren@gmail.com>
Subject: [PATCH 0/3] Add testcases showing suboptimal submodule/path conflict handling
Date: Sat, 7 Jul 2018 13:44:01 -0700 [thread overview]
Message-ID: <20180707204404.7208-1-newren@gmail.com> (raw)
Last November, Stefan asked me about an issue with submodules. In
addition to providing a fix for that issue, I mentioned a few other
problems I noticed with submodules and merging[1]. Turn those issues
into testcases (as I probably should have done back then).
[1] https://public-inbox.org/git/CABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@mail.gmail.com/
Elijah Newren (3):
t7405: add a file/submodule conflict
t7405: add a directory/submodule conflict
t7405: verify 'merge --abort' works after submodule/path conflicts
t/t7405-submodule-merge.sh | 173 +++++++++++++++++++++++++++++++++++++
1 file changed, 173 insertions(+)
--
2.18.0.134.gafc206209.dirty
next reply other threads:[~2018-07-07 20:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-07 20:44 Elijah Newren [this message]
2018-07-07 20:44 ` [PATCH 1/3] t7405: add a file/submodule conflict Elijah Newren
2018-07-09 21:11 ` Stefan Beller
2018-07-10 15:28 ` Elijah Newren
2018-07-10 15:53 ` Stefan Beller
2018-07-10 17:30 ` Elijah Newren
2018-07-07 20:44 ` [PATCH 2/3] t7405: add a directory/submodule conflict Elijah Newren
2018-07-07 20:44 ` [PATCH 3/3] t7405: verify 'merge --abort' works after submodule/path conflicts Elijah Newren
2018-07-11 3:56 ` [PATCH v2 0/3] Add testcases showing suboptimal submodule/path conflict handling Elijah Newren
2018-07-11 3:56 ` [PATCH v2 1/3] t7405: add a file/submodule conflict Elijah Newren
2018-07-11 3:56 ` [PATCH v2 2/3] t7405: add a directory/submodule conflict Elijah Newren
2018-07-11 3:56 ` [PATCH v2 3/3] t7405: verify 'merge --abort' works after submodule/path conflicts Elijah Newren
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=20180707204404.7208-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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.