reset: fix mixed reset when using sparse-checkout
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest1 patch 21 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/1 | reset: fix reset when using the sparse-checkout feature.builtin/ t/ | +85 | 21 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/1] reset: fix mixed reset when using sparse-checkout
Original discussion is here
https://public-inbox.org/git/[email protected]/
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
Signature · 1 line
2.14.1.474.g0558484247.dirty