mirror of
https://github.com/git/git.git
synced 2026-09-27 17:01:57 +02:00
Junio C Hamano
94cf62176e
During a conflicted merge, rebase, or cherry-pick, 'git add -u' is a handy way to add modified paths to the index. However, '-u' indiscriminately adds all modified tracked paths, including unmerged paths that may still contain unresolved conflict markers. It also adds tracked files modified in the worktree that are not involved in the ongoing merge. The latter is not a huge problem for "git rebase", which refuses to start with any local changes, but is a problem for "git merge", which is often run with local changes in maintainer workflows. Introduce 'git add --resolved' to add only unmerged paths, limited by an optional pathspec, where no conflict markers remain in the working tree. Before modifying the index, scan unmerged regular files for leftover conflict markers using a new helper, has_conflict_markers(), defined in merge-ll.c in terms of the is_conflict_marker_line() helper we introduced earlier. If any unmerged path still contains conflict markers, show an error listing the conflicted paths and abort without updating the index. Otherwise, add these unmerged paths that do not have conflict markers to the index. Note that unmerged paths without conflict markers (such as binary files and deletions) are added as resolved using add_file_to_index() and remove_file_from_index_with_flags(). Tracked files that were not in a conflicted state are ignored by '--resolved'. Signed-off-by: Junio C Hamano <gitster@pobox.com>
109 lines
3.2 KiB
Bash
Executable File
109 lines
3.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git add --resolved
|
|
|
|
Test that "git add --resolved" stages conflict-resolved paths and
|
|
refuses to stage when conflict markers remain.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup repo' '
|
|
echo base >file1.txt &&
|
|
echo base >file2.txt &&
|
|
echo base >file3.txt &&
|
|
echo base >file4.txt &&
|
|
git add file1.txt file2.txt file3.txt file4.txt &&
|
|
git commit -m initial &&
|
|
|
|
git branch topic &&
|
|
echo "ours 1" >file1.txt &&
|
|
echo "ours 2" >file2.txt &&
|
|
echo "ours 3" >file3.txt &&
|
|
git commit -a -m ours &&
|
|
|
|
git checkout topic &&
|
|
echo "theirs 1" >file1.txt &&
|
|
echo "theirs 2" >file2.txt &&
|
|
echo "theirs 3" >file3.txt &&
|
|
git commit -a -m theirs &&
|
|
|
|
git checkout @{-1}
|
|
'
|
|
|
|
test_expect_success 'git add --resolved refuses files with conflict markers' '
|
|
test_when_finished "git reset --hard HEAD" &&
|
|
test_must_fail git merge topic &&
|
|
echo "resolved 1" >file1.txt &&
|
|
test_must_fail git add --resolved 2>err &&
|
|
test_grep "the following paths still have conflict markers:" err &&
|
|
test_grep "file2.txt" err &&
|
|
test_grep "file3.txt" err &&
|
|
# Index should remain unmerged for all files
|
|
git ls-files -u file1.txt >unmerged &&
|
|
test_line_count = 3 unmerged
|
|
'
|
|
|
|
test_expect_success 'git add --resolved succeeds when all conflict markers are removed' '
|
|
test_when_finished "git reset --hard HEAD" &&
|
|
test_must_fail git merge topic &&
|
|
echo "resolved 1" >file1.txt &&
|
|
echo "resolved 2" >file2.txt &&
|
|
echo "resolved 3" >file3.txt &&
|
|
git add --resolved &&
|
|
git ls-files -u >unmerged &&
|
|
test_must_be_empty unmerged &&
|
|
git ls-files -s file1.txt file2.txt file3.txt >staged &&
|
|
test_line_count = 3 staged
|
|
'
|
|
|
|
test_expect_success 'git add --resolved ignores unconflicted modified files' '
|
|
test_when_finished "git reset --hard HEAD" &&
|
|
echo "unconflicted local change" >>file4.txt &&
|
|
test_must_fail git merge topic &&
|
|
echo "resolved 1" >file1.txt &&
|
|
echo "resolved 2" >file2.txt &&
|
|
echo "resolved 3" >file3.txt &&
|
|
git add --resolved &&
|
|
# file1, file2, file3 should be staged as resolved
|
|
git ls-files -u >unmerged &&
|
|
test_must_be_empty unmerged &&
|
|
# file4 should remain unstaged in working tree
|
|
git diff file4.txt >diff_out &&
|
|
test_grep "unconflicted local change" diff_out &&
|
|
git diff --cached file4.txt >cached_out &&
|
|
test_must_be_empty cached_out
|
|
'
|
|
|
|
test_expect_success 'git add --resolved handles file removals' '
|
|
test_when_finished "git reset --hard HEAD" &&
|
|
test_must_fail git merge topic &&
|
|
echo "resolved 1" >file1.txt &&
|
|
rm file2.txt &&
|
|
echo "resolved 3" >file3.txt &&
|
|
git add --resolved &&
|
|
git ls-files -s file2.txt >out &&
|
|
test_must_be_empty out
|
|
'
|
|
|
|
test_expect_success 'git add --resolved honors pathspec' '
|
|
test_when_finished "git reset --hard HEAD" &&
|
|
test_must_fail git merge topic &&
|
|
echo "resolved 1" >file1.txt &&
|
|
# file2.txt and file3.txt still have conflict markers,
|
|
# but pathspec targets only file1.txt
|
|
git add --resolved file1.txt &&
|
|
git ls-files -u file1.txt >unmerged1 &&
|
|
test_must_be_empty unmerged1 &&
|
|
git ls-files -u file2.txt >unmerged2 &&
|
|
test_line_count = 3 unmerged2
|
|
'
|
|
|
|
test_expect_success 'git add --resolved incompatibility with -u and -A' '
|
|
test_must_fail git add --resolved -u 2>err1 &&
|
|
test_grep "cannot be used together" err1 &&
|
|
test_must_fail git add --resolved -A 2>err2 &&
|
|
test_grep "cannot be used together" err2
|
|
'
|
|
|
|
test_done
|