From: Kevin Willford <kcwillford@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, Kevin Willford <kewillf@microsoft.com>
Subject: [PATCH 0/3] fix working directory file issues while using sparse-checkout
Date: Fri, 7 Apr 2017 12:23:54 -0700 [thread overview]
Message-ID: <20170407192357.948-1-kewillf@microsoft.com> (raw)
While using the sparse-checkout feature there are scenarios where
the working directory should and should not be updated. This patch
series addresses issues found in reset, apply, and merge conflicts.
Kevin Willford (3):
merge-recursive.c: conflict using sparse should update file
apply.c: do not checkout file when skip-worktree bit set
reset.c: update files when using sparse to avoid data loss.
apply.c | 18 +++++++++++++
builtin/reset.c | 34 +++++++++++++++++++++++
merge-recursive.c | 8 ++++++
t/t7114-reset-sparse-checkout.sh | 58 ++++++++++++++++++++++++++++++++++++++++
t/t7614-merge-sparse-checkout.sh | 27 +++++++++++++++++++
5 files changed, 145 insertions(+)
create mode 100755 t/t7114-reset-sparse-checkout.sh
create mode 100755 t/t7614-merge-sparse-checkout.sh
--
2.12.2.windows.2.1.g7df5db8d31
next reply other threads:[~2017-04-07 19:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 19:23 Kevin Willford [this message]
2017-04-07 19:23 ` [PATCH 1/3] merge-recursive.c: conflict using sparse should update file Kevin Willford
2017-04-10 10:36 ` Duy Nguyen
2017-04-07 19:23 ` [PATCH 2/3] apply.c: do not checkout file when skip-worktree bit set Kevin Willford
2017-04-07 22:28 ` Stefan Beller
2017-04-10 10:11 ` Duy Nguyen
2017-04-07 19:23 ` [PATCH 3/3] reset.c: update files when using sparse to avoid data loss Kevin Willford
2017-04-07 22:41 ` Stefan Beller
2017-04-10 10:24 ` Duy Nguyen
2017-04-11 22:30 ` Kevin Willford
2017-04-12 13:21 ` Duy Nguyen
2017-04-12 15:37 ` Kevin Willford
2017-04-16 4:25 ` Duy Nguyen
2017-04-17 12:09 ` Duy Nguyen
2017-04-07 19:27 ` [PATCH 0/3] fix working directory file issues while using sparse-checkout Stefan Beller
2017-04-07 19:27 ` Stefan Beller
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=20170407192357.948-1-kewillf@microsoft.com \
--to=kcwillford@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kewillf@microsoft.com \
--cc=peff@peff.net \
/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.