diff options
Diffstat (limited to 't/t3701-add-interactive.sh')
| -rwxr-xr-x | t/t3701-add-interactive.sh | 132 |
1 files changed, 114 insertions, 18 deletions
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index b6eba6a839..24ddd8a704 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -3,8 +3,9 @@ test_description='add -i basic tests' . ./test-lib.sh -if ! test_have_prereq PERL; then - say 'skipping git add -i tests, perl not available' +if ! test_have_prereq PERL +then + skip_all='skipping add -i tests, perl not available' test_done fi @@ -18,6 +19,8 @@ test_expect_success 'status works (initial)' ' git add -i </dev/null >output && grep "+1/-0 *+2/-0 file" output ' + +test_expect_success 'setup expected' ' cat >expected <<EOF new file mode 100644 index 0000000..d95f3ad @@ -26,6 +29,8 @@ index 0000000..d95f3ad @@ -0,0 +1 @@ +content EOF +' + test_expect_success 'diff works (initial)' ' (echo d; echo 1) | git add -i >output && sed -ne "/new file/,/content/p" <output >diff && @@ -51,6 +56,8 @@ test_expect_success 'status works (commit)' ' git add -i </dev/null >output && grep "+1/-0 *+2/-0 file" output ' + +test_expect_success 'setup expected' ' cat >expected <<EOF index 180b47c..b6f2c08 100644 --- a/file @@ -59,6 +66,8 @@ index 180b47c..b6f2c08 100644 baseline +content EOF +' + test_expect_success 'diff works (commit)' ' (echo d; echo 1) | git add -i >output && sed -ne "/^index/,/content/p" <output >diff && @@ -71,48 +80,64 @@ test_expect_success 'revert works (commit)' ' grep "unchanged *+3/-0 file" output ' + +test_expect_success 'setup expected' ' cat >expected <<EOF EOF -cat >fake_editor.sh <<EOF -EOF -chmod a+x fake_editor.sh -test_set_editor "$(pwd)/fake_editor.sh" +' + +test_expect_success 'setup fake editor' ' + >fake_editor.sh && + chmod a+x fake_editor.sh && + test_set_editor "$(pwd)/fake_editor.sh" +' + test_expect_success 'dummy edit works' ' (echo e; echo a) | git add -p && git diff > diff && test_cmp expected diff ' +test_expect_success 'setup patch' ' cat >patch <<EOF @@ -1,1 +1,4 @@ this +patch --doesn't +-does not apply EOF -echo "#!$SHELL_PATH" >fake_editor.sh -cat >>fake_editor.sh <<\EOF +' + +test_expect_success 'setup fake editor' ' + echo "#!$SHELL_PATH" >fake_editor.sh && + cat >>fake_editor.sh <<\EOF && mv -f "$1" oldpatch && mv -f patch "$1" EOF -chmod a+x fake_editor.sh -test_set_editor "$(pwd)/fake_editor.sh" + chmod a+x fake_editor.sh && + test_set_editor "$(pwd)/fake_editor.sh" +' + test_expect_success 'bad edit rejected' ' git reset && (echo e; echo n; echo d) | git add -p >output && grep "hunk does not apply" output ' +test_expect_success 'setup patch' ' cat >patch <<EOF this patch is garbage EOF +' + test_expect_success 'garbage edit rejected' ' git reset && (echo e; echo n; echo d) | git add -p >output && grep "hunk does not apply" output ' +test_expect_success 'setup patch' ' cat >patch <<EOF @@ -1,0 +1,0 @@ baseline @@ -120,6 +145,9 @@ cat >patch <<EOF +newcontent +lines EOF +' + +test_expect_success 'setup expected' ' cat >expected <<EOF diff --git a/file b/file index b5dd6c9..f910ae9 100644 @@ -132,6 +160,8 @@ index b5dd6c9..f910ae9 100644 +more lines EOF +' + test_expect_success 'real edit works' ' (echo e; echo n; echo d) | git add -p && git diff >output && @@ -152,13 +182,6 @@ test_expect_success 'skip files similarly as commit -a' ' ' rm -f .gitignore -if test "$(git config --bool core.filemode)" = false -then - say 'skipping filemode tests (filesystem does not properly support modes)' -else - test_set_prereq FILEMODE -fi - test_expect_success FILEMODE 'patch does not affect mode' ' git reset --hard && echo content >>file && @@ -197,6 +220,7 @@ test_expect_success 'setup again' ' ' # Write the patch file with a new line at the top and bottom +test_expect_success 'setup patch' ' cat >patch <<EOF index 180b47c..b6f2c08 100644 --- a/file @@ -207,7 +231,10 @@ index 180b47c..b6f2c08 100644 content +lastline EOF +' + # Expected output, similar to the patch but w/ diff at the top +test_expect_success 'setup expected' ' cat >expected <<EOF diff --git a/file b/file index b6f2c08..61b9053 100755 @@ -219,6 +246,8 @@ index b6f2c08..61b9053 100755 content +lastline EOF +' + # Test splitting the first patch, then adding both test_expect_success 'add first line works' ' git commit -am "clear local changes" && @@ -228,6 +257,7 @@ test_expect_success 'add first line works' ' test_cmp expected diff ' +test_expect_success 'setup expected' ' cat >expected <<EOF diff --git a/non-empty b/non-empty deleted file mode 100644 @@ -237,6 +267,8 @@ index d95f3ad..0000000 @@ -1 +0,0 @@ -content EOF +' + test_expect_success 'deleting a non-empty file' ' git reset --hard && echo content >non-empty && @@ -248,11 +280,13 @@ test_expect_success 'deleting a non-empty file' ' test_cmp expected diff ' +test_expect_success 'setup expected' ' cat >expected <<EOF diff --git a/empty b/empty deleted file mode 100644 index e69de29..0000000 EOF +' test_expect_success 'deleting an empty file' ' git reset --hard && @@ -265,4 +299,66 @@ test_expect_success 'deleting an empty file' ' test_cmp expected diff ' +test_expect_success 'split hunk setup' ' + git reset --hard && + for i in 10 20 30 40 50 60 + do + echo $i + done >test && + git add test && + test_tick && + git commit -m test && + + for i in 10 15 20 21 22 23 24 30 40 50 60 + do + echo $i + done >test +' + +test_expect_success 'split hunk "add -p (edit)"' ' + # Split, say Edit and do nothing. Then: + # + # 1. Broken version results in a patch that does not apply and + # only takes [y/n] (edit again) so the first q is discarded + # and then n attempts to discard the edit. Repeat q enough + # times to get out. + # + # 2. Correct version applies the (not)edited version, and asks + # about the next hunk, against which we say q and program + # exits. + for a in s e q n q q + do + echo $a + done | + EDITOR=: git add -p && + git diff >actual && + ! grep "^+15" actual +' + +test_expect_success 'patch mode ignores unmerged entries' ' + git reset --hard && + test_commit conflict && + test_commit non-conflict && + git checkout -b side && + test_commit side conflict.t && + git checkout master && + test_commit master conflict.t && + test_must_fail git merge side && + echo changed >non-conflict.t && + echo y | git add -p >output && + ! grep a/conflict.t output && + cat >expected <<-\EOF && + * Unmerged path conflict.t + diff --git a/non-conflict.t b/non-conflict.t + index f766221..5ea2ed4 100644 + --- a/non-conflict.t + +++ b/non-conflict.t + @@ -1 +1 @@ + -non-conflict + +changed + EOF + git diff --cached >diff && + test_cmp expected diff +' + test_done |