aboutsummaryrefslogtreecommitdiff
path: root/t/t3701-add-interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-18 23:32:58 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-18 23:32:58 -0700
commit09ba7b2d9fc9142a2195082dd0e74c8161b6b744 (patch)
treeb1a787a2fe289c10c7cf70e27239fc02999a159f /t/t3701-add-interactive.sh
parent91e50b2c0a3bfa818454590fcc6a1ef70c3c58d0 (diff)
parent3d792161b1c86632d5331bb30d6b7c6b17261f38 (diff)
downloadgit-09ba7b2d9fc9142a2195082dd0e74c8161b6b744.tar.gz
git-09ba7b2d9fc9142a2195082dd0e74c8161b6b744.tar.xz
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
* tr/maint-1.6.3-add-p-modeonly-fix: add -p: do not attempt to coalesce mode changes git add -p: demonstrate failure when staging both mode and hunk
Diffstat (limited to 't/t3701-add-interactive.sh')
-rwxr-xr-xt/t3701-add-interactive.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index fd2a55a5c..62fd65e18 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -163,6 +163,17 @@ test_expect_success FILEMODE 'stage mode but not hunk' '
git diff file | grep "+content"
'
+
+test_expect_success FILEMODE 'stage mode and hunk' '
+ git reset --hard &&
+ echo content >>file &&
+ chmod +x file &&
+ printf "y\\ny\\n" | git add -p &&
+ git diff --cached file | grep "new mode" &&
+ git diff --cached file | grep "+content" &&
+ test -z "$(git diff file)"
+'
+
# end of tests disabled when filemode is not usable
test_expect_success 'setup again' '