diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-23 22:29:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-23 22:29:19 -0700 |
| commit | 70ed433c2b66d192b84d4a1ef7fb193ea35e0a28 (patch) | |
| tree | a1dfa980c1a8ba2269789a439c84468666f0db8e /t | |
| parent | 024ab976fffdc1d78b6d0b15e261b52f3a5d594b (diff) | |
| parent | b145b211baa4129a827cc1b1b1a7984523b8f903 (diff) | |
| download | git-70ed433c2b66d192b84d4a1ef7fb193ea35e0a28.tar.gz | |
Merge branch 'pv/maint-add-p-no-exclude' into maint
* pv/maint-add-p-no-exclude:
git-add--interactive: never skip files included in index
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3701-add-interactive.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 62fd65e18d..687bd7ab53 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -138,6 +138,20 @@ test_expect_success 'real edit works' ' test_cmp expected output ' +test_expect_success 'skip files similarly as commit -a' ' + git reset && + echo file >.gitignore && + echo changed >file && + echo y | git add -p file && + git diff >output && + git reset && + git commit -am commit && + git diff >expected && + test_cmp expected output && + git reset --hard HEAD^ +' +rm -f .gitignore + if test "$(git config --bool core.filemode)" = false then say 'skipping filemode tests (filesystem does not properly support modes)' |