diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2015-04-16 09:02:28 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-04-16 14:14:10 -0700 |
| commit | 1bf01040f0c1101f410f9caa5e715460cdd0cbe0 (patch) | |
| tree | e955c98fcd4619b12b733af93b0b0b09bea4caee /t | |
| parent | t3701-add-interactive: simplify code (diff) | |
| download | tgif-1bf01040f0c1101f410f9caa5e715460cdd0cbe0.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3701-add-interactive.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index b63b9d4c8e..deae948c76 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -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 && |