Add tests for --include (-i) and --only (-o) of commit. This includes testing --include with and without staged changes, testing --only with and without staged changes and testing --only and --include together. Some tests already exist in t7501 for testing --only, however, it is only tested in combination with --amend, --allow-empty and to-be-born branch, and not for testing --only separately. Similarly there are no separate tests for --include. These tests are an addition to other similar tests in t7501, as described above in the case of --only, therefore, they belong in t7501-commit-basic-functionality. Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@xxxxxxxxx> --- t/t7501-commit-basic-functionality.sh | 43 ++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh index 3d8500a52e..e005175d0b 100755 --- a/t/t7501-commit-basic-functionality.sh +++ b/t/t7501-commit-basic-functionality.sh @@ -3,7 +3,7 @@ # Copyright (c) 2007 Kristian Høgsberg <krh@xxxxxxxxxx> # -# FIXME: Test the various index usages, -i and -o, test reflog, +# fixme: test the various index usages, test reflog, # signoff test_description='git commit' @@ -150,6 +150,47 @@ test_expect_success 'setup: commit message from file' ' git commit -F msg -a ' +test_expect_success '--include fails with untracked files' ' + echo content >baz && + test_must_fail git commit --include -m "initial" baz +' + +test_expect_success '--include with staged changes' ' + echo newcontent >baz && + echo newcontent >file && + git add file && + git commit --include -m "file baz" baz && + + git diff --name-only >remaining && + test_must_be_empty remaining && + git diff --name-only --staged >remaining && + test_must_be_empty remaining +' + +test_expect_success '--only fails with untracked files' ' + echo content >newfile && + test_must_fail git commit --only -m "newfile" newfile +' + +test_expect_success '--only excludes staged changes' ' + echo content >file && + echo content >baz && + git add baz && + git commit --only -m "file" file && + + git diff --name-only >actual && + test_must_be_empty actual && + git diff --name-only --staged >actual && + test_grep "baz" actual +' + +test_expect_success '--include and --only do not mix' ' + test_when_finished "git reset --hard" && + echo new >file && + echo new >baz && + test_must_fail git commit --include --only -m "bar" bar baz +' + test_expect_success 'amend commit' ' cat >editor <<-\EOF && #!/bin/sh -- 2.43.0
