3 test_description
='add -i basic tests'
5 .
"$TEST_DIRECTORY"/lib-terminal.sh
7 if ! test_have_prereq PERL
9 skip_all
='skipping add -i tests, perl not available'
16 sed -e '/^index/s/[0-9a-f]*[1-9a-f][0-9a-f]*\.\./1234567../' \
17 -e '/^index/s/\.\.[0-9a-f]*[1-9a-f][0-9a-f]*/..9abcdef/' \
18 -e '/^index/s/ 00*\.\./ 0000000../' \
19 -e '/^index/s/\.\.00*$/..0000000/' \
20 -e '/^index/s/\.\.00* /..0000000 /' \
23 test_cmp
"$1.filtered" "$2.filtered"
26 # This function uses a trick to manipulate the interactive add to use color:
27 # the `want_color()` function special-cases the situation where a pager was
28 # spawned and Git now wants to output colored text: to detect that situation,
29 # the environment variable `GIT_PAGER_IN_USE` is set. However, color is
30 # suppressed despite that environment variable if the `TERM` variable
31 # indicates a dumb terminal, so we set that variable, too.
34 env GIT_PAGER_IN_USE
=true TERM
=vt100
"$@"
37 test_expect_success
'setup (initial)' '
43 test_expect_success
'status works (initial)' '
44 git add -i </dev/null >output &&
45 grep "+1/-0 *+2/-0 file" output
48 test_expect_success
'setup expected' '
51 index 0000000..d95f3ad
59 test_expect_success
'diff works (initial)' '
60 test_write_lines d 1 | git add -i >output &&
61 sed -ne "/new file/,/content/p" <output >diff &&
62 diff_cmp expected diff
64 test_expect_success
'revert works (initial)' '
66 test_write_lines r 1 | git add -i &&
67 git ls-files >output &&
71 test_expect_success
'add untracked (multiple)' '
72 test_when_finished "git reset && rm [1-9]" &&
73 touch $(test_seq 9) &&
74 test_write_lines a "2-5 8-" | git add -i -- [1-9] &&
75 test_write_lines 2 3 4 5 8 9 >expected &&
76 git ls-files [1-9] >output &&
77 test_cmp expected output
80 test_expect_success
'setup (commit)' '
81 echo baseline >file &&
83 git commit -m commit &&
84 echo content >>file &&
89 test_expect_success
'status works (commit)' '
90 git add -i </dev/null >output &&
91 grep "+1/-0 *+2/-0 file" output
94 test_expect_success
'setup expected' '
96 index 180b47c..b6f2c08 100644
105 test_expect_success
'diff works (commit)' '
106 test_write_lines d 1 | git add -i >output &&
107 sed -ne "/^index/,/content/p" <output >diff &&
108 diff_cmp expected diff
110 test_expect_success
'revert works (commit)' '
112 test_write_lines r 1 | git add -i &&
113 git add -i </dev/null >output &&
114 grep "unchanged *+3/-0 file" output
117 test_expect_success
'setup expected' '
118 cat >expected <<-\EOF
122 test_expect_success
'dummy edit works' '
124 test_write_lines e a | git add -p &&
126 diff_cmp expected diff
129 test_expect_success
'setup patch' '
139 test_expect_success
'setup fake editor' '
140 write_script "fake_editor.sh" <<-\EOF &&
141 mv -f "$1" oldpatch &&
144 test_set_editor "$(pwd)/fake_editor.sh"
147 test_expect_success
'bad edit rejected' '
149 test_write_lines e n d | git add -p >output &&
150 grep "hunk does not apply" output
153 test_expect_success
'setup patch' '
160 test_expect_success
'garbage edit rejected' '
162 test_write_lines e n d | git add -p >output &&
163 grep "hunk does not apply" output
166 test_expect_success
'setup patch' '
176 test_expect_success
'setup expected' '
177 cat >expected <<-\EOF
178 diff --git a/file b/file
179 index b5dd6c9..f910ae9 100644
191 test_expect_success
'real edit works' '
192 test_write_lines e n d | git add -p &&
194 diff_cmp expected output
197 test_expect_success
'setup file' '
198 test_write_lines a "" b "" c >file &&
200 test_write_lines a "" d "" c >file
203 test_expect_success
'setup patch' '
217 test_expect_success
'setup expected' '
219 diff --git a/file b/file
220 index b5dd6c9..f910ae9 100644
233 test_expect_success
'edit can strip spaces from empty context lines' '
234 test_write_lines e n q | git add -p 2>error &&
235 test_must_be_empty error &&
237 diff_cmp expected output
240 test_expect_success
'skip files similarly as commit -a' '
242 echo file >.gitignore &&
243 echo changed >file &&
244 echo y | git add -p file &&
247 git commit -am commit &&
248 git diff >expected &&
249 diff_cmp expected output &&
250 git reset --hard HEAD^
254 test_expect_success FILEMODE
'patch does not affect mode' '
256 echo content >>file &&
258 printf "n\\ny\\n" | git add -p &&
259 git show :file | grep content &&
260 git diff file | grep "new mode"
263 test_expect_success FILEMODE
'stage mode but not hunk' '
265 echo content >>file &&
267 printf "y\\nn\\n" | git add -p &&
268 git diff --cached file | grep "new mode" &&
269 git diff file | grep "+content"
273 test_expect_success FILEMODE
'stage mode and hunk' '
275 echo content >>file &&
277 printf "y\\ny\\n" | git add -p &&
278 git diff --cached file | grep "new mode" &&
279 git diff --cached file | grep "+content" &&
280 test -z "$(git diff file)"
283 # end of tests disabled when filemode is not usable
285 test_expect_success
'different prompts for mode change/deleted' '
289 git add --chmod=+x file deleted &&
290 echo changed >file &&
292 test_write_lines n n n |
293 git -c core.filemode=true add -p >actual &&
294 sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered &&
295 cat >expect <<-\EOF &&
296 (1/1) Stage deletion [y,n,q,a,d,?]?
297 (1/2) Stage mode change [y,n,q,a,d,j,J,g,/,?]?
298 (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]?
300 test_cmp expect actual.filtered
303 test_expect_success
'correct message when there is nothing to do' '
306 test_i18ngrep "No changes" err &&
307 printf "\\0123" >binary &&
309 printf "\\0abc" >binary &&
311 test_i18ngrep "Only binary files changed" err
314 test_expect_success
'setup again' '
316 test_chmod +x file &&
320 # Write the patch file with a new line at the top and bottom
321 test_expect_success
'setup patch' '
323 index 180b47c..b6f2c08 100644
331 \ No newline at end of file
335 # Expected output, diff is similar to the patch but w/ diff at the top
336 test_expect_success
'setup expected' '
337 echo diff --git a/file b/file >expected &&
338 cat patch |sed "/^index/s/ 100644/ 100755/" >>expected &&
339 cat >expected-output <<-\EOF
347 \ No newline at end of file
356 \ No newline at end of file
360 # Test splitting the first patch, then adding both
361 test_expect_success C_LOCALE_OUTPUT
'add first line works' '
362 git commit -am "clear local changes" &&
364 printf "%s\n" s y y | git add -p file 2>error |
365 sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
366 -e "/^[-+@ \\\\]"/p >output &&
367 test_must_be_empty error &&
368 git diff --cached >diff &&
369 diff_cmp expected diff &&
370 test_cmp expected-output output
373 test_expect_success
'setup expected' '
374 cat >expected <<-\EOF
375 diff --git a/non-empty b/non-empty
376 deleted file mode 100644
377 index d95f3ad..0000000
385 test_expect_success
'deleting a non-empty file' '
387 echo content >non-empty &&
389 git commit -m non-empty &&
391 echo y | git add -p non-empty &&
392 git diff --cached >diff &&
393 diff_cmp expected diff
396 test_expect_success
'setup expected' '
397 cat >expected <<-\EOF
398 diff --git a/empty b/empty
399 deleted file mode 100644
400 index e69de29..0000000
404 test_expect_success
'deleting an empty file' '
408 git commit -m empty &&
410 echo y | git add -p empty &&
411 git diff --cached >diff &&
412 diff_cmp expected diff
415 test_expect_success
'split hunk setup' '
417 test_write_lines 10 20 30 40 50 60 >test &&
420 git commit -m test &&
422 test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
425 test_expect_success
'goto hunk' '
426 test_when_finished "git reset" &&
427 tr _ " " >expect <<-EOF &&
428 (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? + 1: -1,2 +1,3 +15
430 go to which hunk? @@ -1,2 +1,3 @@
434 (1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_
436 test_write_lines s y g 1 | git add -p >actual &&
437 tail -n 7 <actual >actual.trimmed &&
438 test_cmp expect actual.trimmed
441 test_expect_success
'navigate to hunk via regex' '
442 test_when_finished "git reset" &&
443 tr _ " " >expect <<-EOF &&
444 (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? @@ -1,2 +1,3 @@
448 (1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_
450 test_write_lines s y /1,2 | git add -p >actual &&
451 tail -n 5 <actual >actual.trimmed &&
452 test_cmp expect actual.trimmed
455 test_expect_success
'split hunk "add -p (edit)"' '
456 # Split, say Edit and do nothing. Then:
458 # 1. Broken version results in a patch that does not apply and
459 # only takes [y/n] (edit again) so the first q is discarded
460 # and then n attempts to discard the edit. Repeat q enough
463 # 2. Correct version applies the (not)edited version, and asks
464 # about the next hunk, against which we say q and program
466 printf "%s\n" s e q n q q |
467 EDITOR=: git add -p &&
472 test_expect_failure
'split hunk "add -p (no, yes, edit)"' '
473 test_write_lines 5 10 20 21 30 31 40 50 60 >test &&
475 # test sequence is s(plit), n(o), y(es), e(dit)
476 # q n q q is there to make sure we exit at the end.
477 printf "%s\n" s n y e q n q q |
478 EDITOR=: git add -p 2>error &&
479 test_must_be_empty error &&
484 test_expect_success
'split hunk with incomplete line at end' '
486 printf "missing LF" >>test &&
488 test_write_lines before 10 20 30 40 50 60 70 >test &&
489 git grep --cached missing &&
490 test_write_lines s n y q | git add -p &&
491 test_must_fail git grep --cached missing &&
493 test_must_fail git grep --cached before
496 test_expect_failure
'edit, adding lines to the first hunk' '
497 test_write_lines 10 11 20 30 40 50 51 60 >test &&
499 tr _ " " >patch <<-EOF &&
509 # test sequence is s(plit), e(dit), n(o)
510 # q n q q is there to make sure we exit at the end.
511 printf "%s\n" s e n q n q q |
512 EDITOR=./fake_editor.sh git add -p 2>error &&
513 test_must_be_empty error &&
514 git diff --cached >actual &&
518 test_expect_success
'patch mode ignores unmerged entries' '
520 test_commit conflict &&
521 test_commit non-conflict &&
522 git checkout -b side &&
523 test_commit side conflict.t &&
524 git checkout master &&
525 test_commit master conflict.t &&
526 test_must_fail git merge side &&
527 echo changed >non-conflict.t &&
528 echo y | git add -p >output &&
529 ! grep a/conflict.t output &&
530 cat >expected <<-\EOF &&
531 * Unmerged path conflict.t
532 diff --git a/non-conflict.t b/non-conflict.t
533 index f766221..5ea2ed4 100644
540 git diff --cached >diff &&
541 diff_cmp expected diff
544 test_expect_success
'diffs can be colorized' '
547 echo content >test &&
549 force_color git add -p >output 2>&1 <y &&
551 # We do not want to depend on the exact coloring scheme
552 # git uses for diffs, so just check that we saw some kind of color.
553 grep "$(printf "\\033")" output
556 test_expect_success
'colorized diffs respect diff.wsErrorHighlight' '
564 force_color git -c diff.wsErrorHighlight=all add -p >output.raw 2>&1 <y &&
565 test_decode_color <output.raw >output &&
569 test_expect_success
'diffFilter filters diff' '
572 echo content >test &&
573 test_config interactive.diffFilter "sed s/^/foo:/" &&
575 force_color git add -p >output 2>&1 <y &&
577 # avoid depending on the exact coloring or content of the prompts,
578 # and just make sure we saw our diff prefixed
579 grep foo:.*content output
582 test_expect_success
'detect bogus diffFilter output' '
585 echo content >test &&
586 test_config interactive.diffFilter "sed 1d" &&
588 test_must_fail force_color git add -p <y
591 test_expect_success
'diff.algorithm is passed to `git diff-files`' '
596 echo changed >file &&
597 test_must_fail git -c diff.algorithm=bogus add -p 2>err &&
598 test_i18ngrep "error: option diff-algorithm accepts " err
601 test_expect_success
'patch-mode via -i prompts for files' '
606 git add -i <<-\EOF &&
615 git diff --cached --name-only >actual &&
616 diff_cmp expect actual
619 test_expect_success
'add -p handles globs' '
624 echo base >subdir/two.c &&
626 git commit -m base &&
628 echo change >one.c &&
629 echo change >subdir/two.c &&
630 git add -p "*.c" <<-\EOF &&
635 cat >expect <<-\EOF &&
639 git diff --cached --name-only >actual &&
640 test_cmp expect actual
643 test_expect_success
'add -p handles relative paths' '
646 echo base >relpath.c &&
648 git commit -m relpath &&
650 echo change >relpath.c &&
652 git -C subdir add -p .. 2>error <<-\EOF &&
656 test_must_be_empty error &&
658 cat >expect <<-\EOF &&
661 git diff --cached --name-only >actual &&
662 test_cmp expect actual
665 test_expect_success
'add -p does not expand argument lists' '
668 echo content >not-changed &&
669 git add not-changed &&
670 git commit -m "add not-changed file" &&
673 GIT_TRACE=$(pwd)/trace.out git add -p . <<-\EOF &&
677 # we know that "file" must be mentioned since we actually
678 # update it, but we want to be sure that our "." pathspec
679 # was not expanded into the argument list of any command.
680 # So look only for "not-changed".
681 ! grep -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
684 test_expect_success
'hunk-editing handles custom comment char' '
686 echo change >>file &&
687 test_config core.commentChar "\$" &&
688 echo e | GIT_EDITOR=true git add -p &&
692 test_expect_success
'add -p works even with color.ui=always' '
694 echo change >>file &&
695 test_config color.ui always &&
696 echo y | git add -p &&
698 git diff --cached --name-only >actual &&
699 test_cmp expect actual
702 test_expect_success
'setup different kinds of dirty submodules' '
703 test_create_repo for-submodules &&
706 test_commit initial &&
707 test_create_repo dirty-head &&
712 cp -R dirty-head dirty-otherwise &&
713 cp -R dirty-head dirty-both-ways &&
714 git add dirty-head &&
715 git add dirty-otherwise dirty-both-ways &&
716 git commit -m initial &&
719 test_commit updated &&
720 cd ../dirty-both-ways &&
721 test_commit updated &&
722 echo dirty >>initial &&
724 cd ../dirty-otherwise &&
725 echo dirty >>initial &&
728 git -C for-submodules diff-files --name-only >actual &&
729 cat >expected <<-\EOF &&
734 test_cmp expected actual &&
735 git -C for-submodules diff-files --name-only --ignore-submodules=dirty >actual &&
736 cat >expected <<-\EOF &&
740 test_cmp expected actual
743 test_expect_success
'status ignores dirty submodules (except HEAD)' '
744 git -C for-submodules add -i </dev/null >output &&
745 grep dirty-head output &&
746 grep dirty-both-ways output &&
747 ! grep dirty-otherwise output
750 test_expect_success
'set up pathological context' '
752 test_write_lines a a a a a a a a a a a >a &&
755 test_write_lines c b a a a a a a a b a a a a >a &&
756 test_write_lines a a a a a a a b a a a a >expected-1 &&
757 test_write_lines b a a a a a a a b a a a a >expected-2 &&
758 # check editing can cope with missing header and deleted context lines
759 # as well as changes to other lines
760 test_write_lines +b " a" >patch
763 test_expect_success
'add -p works with pathological context lines' '
767 git cat-file blob :a >actual &&
768 test_cmp expected-1 actual
771 test_expect_success
'add -p patch editing works with pathological context lines' '
773 # n q q below is in case edit fails
774 printf "%s\n" e y n q q |
776 git cat-file blob :a >actual &&
777 test_cmp expected-2 actual
780 test_expect_success
'checkout -p works with pathological context lines' '
781 test_write_lines a a a a a a >a &&
783 test_write_lines a b a b a b a b a b a > a&&
784 test_write_lines s n n y q | git checkout -p &&
785 test_write_lines a b a b a a b a b a >expect &&
789 test_expect_success
'show help from add--helper' '
791 cat >expect <<-EOF &&
793 <BOLD>*** Commands ***<RESET>
794 1: <BOLD;BLUE>s<RESET>tatus 2: <BOLD;BLUE>u<RESET>pdate 3: <BOLD;BLUE>r<RESET>evert 4: <BOLD;BLUE>a<RESET>dd untracked
795 5: <BOLD;BLUE>p<RESET>atch 6: <BOLD;BLUE>d<RESET>iff 7: <BOLD;BLUE>q<RESET>uit 8: <BOLD;BLUE>h<RESET>elp
796 <BOLD;BLUE>What now<RESET>> <BOLD;RED>status - show paths with changes<RESET>
797 <BOLD;RED>update - add working tree state to the staged set of changes<RESET>
798 <BOLD;RED>revert - revert staged set of changes back to the HEAD version<RESET>
799 <BOLD;RED>patch - pick hunks and update selectively<RESET>
800 <BOLD;RED>diff - view diff between HEAD and index<RESET>
801 <BOLD;RED>add untracked - add contents of untracked files to the staged set of changes<RESET>
802 <BOLD>*** Commands ***<RESET>
803 1: <BOLD;BLUE>s<RESET>tatus 2: <BOLD;BLUE>u<RESET>pdate 3: <BOLD;BLUE>r<RESET>evert 4: <BOLD;BLUE>a<RESET>dd untracked
804 5: <BOLD;BLUE>p<RESET>atch 6: <BOLD;BLUE>d<RESET>iff 7: <BOLD;BLUE>q<RESET>uit 8: <BOLD;BLUE>h<RESET>elp
805 <BOLD;BLUE>What now<RESET>>$SP
808 test_write_lines h | force_color git add -i >actual.colored &&
809 test_decode_color <actual.colored >actual &&
810 test_i18ncmp expect actual