From: Ben Peart <Ben.Peart@microsoft.com>
To: "peartben@gmail.com" <peartben@gmail.com>
Cc: Ben Peart <Ben.Peart@microsoft.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Kevin Willford <kewillf@microsoft.com>,
"newren@gmail.com" <newren@gmail.com>
Subject: [PATCH v2 0/2] Preserve skip_worktree bit in merges when necessary
Date: Fri, 27 Jul 2018 12:59:41 +0000 [thread overview]
Message-ID: <20180727125923.11744-1-benpeart@microsoft.com> (raw)
In-Reply-To: <5a8d1098-b4c5-64e1-da98-dac13521e7ba@gmail.com>
Sending this update as Elijah is on vacation. This only updates the test
case based on feedback from the list.
Base Ref: master
Web-Diff: https://github.com/benpeart/git/commit/0ab3816d61
Checkout: git fetch https://github.com/benpeart/git merge-recursive-v2 && git checkout 0ab3816d61
### Patches
Ben Peart (1):
t3507: add a testcase showing failure with sparse checkout
Elijah Newren (1):
merge-recursive: preserve skip_worktree bit when necessary
merge-recursive.c | 16 ++++++++++++++++
t/t3507-cherry-pick-conflict.sh | 13 +++++++++++++
2 files changed, 29 insertions(+)
base-commit: ffc6fa0e396238de3a30623912980263b4f283ab
--
2.17.0.gvfs.1.123.g449c066
next prev parent reply other threads:[~2018-07-27 12:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 19:53 [BUG] merge-recursive overly aggressive when skipping updating the working tree Ben Peart
2018-07-20 20:48 ` Elijah Newren
2018-07-20 21:13 ` Junio C Hamano
2018-07-20 21:42 ` Elijah Newren
2018-07-20 22:05 ` Junio C Hamano
2018-07-20 23:02 ` Elijah Newren
2018-07-23 12:49 ` Ben Peart
2018-07-21 6:34 ` [PATCH 0/2] Preserve skip_worktree bit in merges when necessary Elijah Newren
2018-07-21 6:34 ` [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout Elijah Newren
2018-07-21 7:21 ` Eric Sunshine
2018-07-23 13:12 ` Ben Peart
2018-07-23 18:09 ` Eric Sunshine
2018-07-23 18:22 ` Ben Peart
2018-07-21 13:02 ` Ben Peart
2018-07-23 18:12 ` Junio C Hamano
2018-07-21 6:34 ` [PATCH 2/2] merge-recursive: preserve skip_worktree bit when necessary Elijah Newren
2018-07-23 14:14 ` Ben Peart
2018-07-27 12:59 ` Ben Peart [this message]
2018-07-27 12:59 ` [PATCH v2 1/2] t3507: add a testcase showing failure with sparse checkout Ben Peart
2018-07-27 12:59 ` [PATCH v2 2/2] merge-recursive: preserve skip_worktree bit when necessary Ben Peart
2018-07-27 18:14 ` [PATCH v2 0/2] Preserve skip_worktree bit in merges " Junio C Hamano
2018-07-31 16:11 ` 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=20180727125923.11744-1-benpeart@microsoft.com \
--to=ben.peart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=kewillf@microsoft.com \
--cc=newren@gmail.com \
--cc=peartben@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.
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.