mirror of
https://github.com/git/git.git
synced 2024-11-25 10:54:00 +08:00
3c58845365
Suggesting "'reset HEAD <path>' to unstage" is dead wrong if we are about to record a merge commit. For either an unmerged path (i.e. with unresolved conflicts), or an updated path, it would result in discarding what the other branch did. Note that we do not do anything special in a case where we are amending a merge. The user is making an evil merge starting from an already committed merge, and running "reset HEAD <path>" is the right way to get rid of the local edit that has been added to the index. Once "reset --unresolve <path>" becomes available, we might want to suggest it for a merged path that has unresolve information, but until then, just remove the incorrect advice. We might also want to suggest "checkout --conflict <path>" to revert the file in the work tree to the state of failed automerge for an unmerged path, but we never did that, and this commit does not change that. Signed-off-by: Junio C Hamano <gitster@pobox.com>
60 lines
1.3 KiB
Bash
Executable File
60 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='basic work tree status reporting'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
test_commit A &&
|
|
test_commit B oneside added &&
|
|
git checkout A^0 &&
|
|
test_commit C oneside created
|
|
'
|
|
|
|
test_expect_success 'A/A conflict' '
|
|
git checkout B^0 &&
|
|
test_must_fail git merge C
|
|
'
|
|
|
|
test_expect_success 'Report path with conflict' '
|
|
git diff --cached --name-status >actual &&
|
|
echo "U oneside" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'Report new path with conflict' '
|
|
git diff --cached --name-status HEAD^ >actual &&
|
|
echo "U oneside" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
# On branch side
|
|
# Unmerged paths:
|
|
# (use "git add/rm <file>..." as appropriate to mark resolution)
|
|
#
|
|
# deleted by us: foo
|
|
#
|
|
no changes added to commit (use "git add" and/or "git commit -a")
|
|
EOF
|
|
|
|
test_expect_success 'M/D conflict does not segfault' '
|
|
mkdir mdconflict &&
|
|
(
|
|
cd mdconflict &&
|
|
git init &&
|
|
test_commit initial foo "" &&
|
|
test_commit modify foo foo &&
|
|
git checkout -b side HEAD^ &&
|
|
git rm foo &&
|
|
git commit -m delete &&
|
|
test_must_fail git merge master &&
|
|
test_must_fail git commit --dry-run >../actual &&
|
|
test_cmp ../expect ../actual &&
|
|
git status >../actual &&
|
|
test_cmp ../expect ../actual
|
|
)
|
|
'
|
|
|
|
test_done
|