diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-08-20 20:47:10 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-08-23 17:14:41 -0700 |
| commit | f1f523eae99020d58ad6e7a1ef8187569e15c270 (patch) | |
| tree | 3344bcf45984a244cd105be11c12ad5e270a20c0 /builtin-merge.c | |
| parent | unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index (diff) | |
| download | tgif-f1f523eae99020d58ad6e7a1ef8187569e15c270.tar.xz | |
unpack-trees(): ignore worktree check outside checkout area
verify_absent() and verify_uptodate() are used to ensure worktree
is safe to be updated, then CE_REMOVE or CE_UPDATE will be set.
Finally check_updates() bases on CE_REMOVE, CE_UPDATE and the
recently added CE_WT_REMOVE to update working directory accordingly.
The entries that are checked may eventually be left out of checkout
area (done later in apply_sparse_checkout()). We don't want to update
outside checkout area. This patch teaches Git to assume "good",
skip these checks when it's sure those entries will be outside checkout
area, and clear CE_REMOVE|CE_UPDATE that could be set due to this
assumption.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions