mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
add -p: demonstrate failure when running 'edit' after a split
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:
parent
416145f07a
commit
1bf01040f0
|
@ -332,6 +332,28 @@ test_expect_success 'split hunk "add -p (edit)"' '
|
|||
! 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' '
|
||||
git reset --hard &&
|
||||
test_commit conflict &&
|
||||
|
|
Loading…
Reference in a new issue