undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -p: demonstrate failure when running 'edit' after a split

Browse Source 
The test passes if one replaces the 'e' command with a 'y' command in
the 'add -p' session.

Reported-by: Tanky Woo <wtq1990@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2015-04-16 09:02:28 +02:00 committed by Junio C Hamano
parent 416145f07a
commit 1bf01040f0
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
t/t3701-add-interactive.sh
View File

@ -332,6 +332,28 @@ test_expect_success 'split hunk "add -p (edit)"' '
! grep "^+15" actual ! grep "^+15" actual
' '
test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
cat >test <<-\EOF &&
5
10
20
21
30
31
40
50
60
EOF
git reset &&
# test sequence is s(plit), n(o), y(es), e(dit)
# q n q q is there to make sure we exit at the end.
printf "%s\n" s n y e q n q q |
EDITOR=: git add -p 2>error &&
test_must_be_empty error &&
git diff >actual &&
! grep "^+31" actual
'
test_expect_success 'patch mode ignores unmerged entries' ' test_expect_success 'patch mode ignores unmerged entries' '
git reset --hard && git reset --hard &&
test_commit conflict && test_commit conflict &&