From: Kevin Willford <kewillf@microsoft.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, pclouds@gmail.com,
Kevin Willford <kewillf@microsoft.com>
Subject: [PATCH 0/1] reset: fix mixed reset when using sparse-checkout
Date: Fri, 8 Sep 2017 12:00:49 -0600 [thread overview]
Message-ID: <20170908180050.25188-1-kewillf@microsoft.com> (raw)
Original discussion is here
https://public-inbox.org/git/20170407192357.948-4-kewillf@microsoft.com/
When running a reset mixed and using the sparse-checkout the working
directory needs to be updated so that there is not data loss when the
index is updated. This is because the index is getting updated
potentially removing entries without changing the working directory.
When using the sparse-checkout feature the entries removed might not
be on disk and are lost.
This patch writes the before version of the file to disk if the mixed
reset is going to change the index of a file that had the skip-wortree
bit so that the file contents before the reset is preserved on disk and
status will reports the correct results.
Kevin Willford (1):
reset: fix reset when using the sparse-checkout feature.
builtin/reset.c | 25 +++++++++++++++++
t/t7114-reset-sparse-checkout.sh | 60 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+)
create mode 100755 t/t7114-reset-sparse-checkout.sh
--
2.14.1.474.g0558484247.dirty
next reply other threads:[~2017-09-08 18:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-08 18:00 Kevin Willford [this message]
2017-09-08 18:00 ` [PATCH 1/1] reset: fix reset when using the sparse-checkout feature Kevin Willford
2017-09-08 18:54 ` Torsten Bögershausen
2017-09-08 19:04 ` Junio C Hamano
2017-09-08 19:01 ` Junio C Hamano
2017-09-08 20:08 ` Kevin Willford
2017-09-08 19:12 ` Junio C Hamano
2017-09-08 20:02 ` Kevin Willford
2017-09-09 3:18 ` Junio C Hamano
2017-09-09 4:54 ` Kevin Willford
2017-09-11 4:01 ` Junio C Hamano
2017-09-11 11:15 ` Johannes Schindelin
2017-09-12 3:56 ` Junio C Hamano
2017-09-12 20:20 ` Kevin Willford
2017-09-12 22:29 ` Jacob Keller
2017-09-12 23:30 ` Kevin Willford
2017-09-13 1:39 ` Jacob Keller
2017-09-13 17:09 ` Kevin Willford
2017-09-13 22:17 ` Junio C Hamano
2017-09-14 14:26 ` Kevin Willford
2017-09-15 5:00 ` Junio C Hamano
2017-09-15 17:21 ` Kevin Willford
2017-09-15 21:33 ` Jacob Keller
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=20170908180050.25188-1-kewillf@microsoft.com \
--to=kewillf@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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.