fix working directory file issues while using sparse-checkout
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest3 patches 12 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | merge-recursive.c: conflict using sparse should update filemerge-recursive.c t/ | +35 | 1 reply | |
| 2/3 | apply.c: do not checkout file when skip-worktree bit setapply.c | +18 | 2 replies | |
| 3/3 | reset.c: update files when using sparse to avoid data loss.builtin/ t/ | +92 | 7 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/3] fix working directory file issues while using sparse-checkout
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
Signature · 1 line
2.12.2.windows.2.1.g7df5db8d31