mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 21:46:10 +02:00
Code

Merge branch 'mk/merge-in-sparse-checkout' 

"git reset --merge" (hence "git merge ---abort") and "git reset --hard"
had trouble working correctly in a sparsely checked out working
tree after a conflict, which has been corrected.

* mk/merge-in-sparse-checkout:
  unpack-trees: do not fail reset because of unmerged skipped entry
This commit is contained in:
Junio C Hamano 2018-07-24 14:50:48 -07:00
parent 6fc7de1a1f b33fdfc34c
commit 284b444932
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
t/t3035-merge-sparse.sh Executable file
View File

@ -0,0 +1,59 @@
#!/bin/sh
test_description='merge with sparse files'
. ./test-lib.sh
# test_file $filename $content
test_file () {
echo "$2" > "$1" &&
git add "$1"
}
# test_commit_this $message_and_tag
test_commit_this () {
git commit -m "$1" &&
git tag "$1"
}
test_expect_success 'setup' '
: >empty &&
test_file checked-out init &&
test_file modify_delete modify_delete_init &&
test_commit_this init &&
test_file modify_delete modify_delete_theirs &&
test_commit_this theirs &&
git reset --hard init &&
git rm modify_delete &&
test_commit_this ours &&
git config core.sparseCheckout true &&
echo "/checked-out" >.git/info/sparse-checkout &&
git reset --hard &&
! git merge theirs
'
test_expect_success 'reset --hard works after the conflict' '
git reset --hard
'
test_expect_success 'is reset properly' '
git status --porcelain -- modify_delete >out &&
test_cmp empty out &&
test_path_is_missing modify_delete
'
test_expect_success 'setup: conflict back' '
! git merge theirs
'
test_expect_success 'Merge abort works after the conflict' '
git merge --abort
'
test_expect_success 'is aborted properly' '
git status --porcelain -- modify_delete >out &&
test_cmp empty out &&
test_path_is_missing modify_delete
'
test_done

2
unpack-trees.c
View File

@ -1247,7 +1247,7 @@ static void mark_new_skip_worktree(struct exclude_list *el,
if (select_flag && !(ce->ce_flags & select_flag))
continue;
if (!ce_stage(ce))
if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))
ce->ce_flags |= skip_wt_flag;
else
ce->ce_flags &= ~skip_wt_flag;