From: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
To: git@vger.kernel.org
Cc: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
Subject: [PATCH 1/2] t7501: Add tests for various index usages, -i and -o, of commit command.
Date: Tue, 9 Jan 2024 11:34:13 +0530 [thread overview]
Message-ID: <20240109060417.1144647-3-shyamthakkar001@gmail.com> (raw)
In-Reply-To: <20240109060417.1144647-2-shyamthakkar001@gmail.com>
This commit adds tests for -i and -o flags of the commit command. It
includes testing -i with and without staged changes, testing -o with and
without staged changes, and testing -i and -o together.
Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
---
t/t7501-commit-basic-functionality.sh | 90 +++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh
index 3d8500a52e..71dc52ce3a 100755
--- a/t/t7501-commit-basic-functionality.sh
+++ b/t/t7501-commit-basic-functionality.sh
@@ -76,6 +76,96 @@ test_expect_success 'nothing to commit' '
test_must_fail git commit -m initial
'
+test_expect_success 'commit with -i fails with untracked files' '
+ test_when_finished "rm -rf testdir" &&
+ git init testdir &&
+ echo content >testdir/file.txt &&
+ test_must_fail git -C testdir commit -i file.txt -m initial
+'
+
+test_expect_success 'commit with -i' '
+ echo content >bar &&
+ git add bar &&
+ git commit -m "bar" &&
+
+ echo content2 >bar &&
+ git commit -i bar -m "bar second"
+'
+
+test_expect_success 'commit with -i multiple files' '
+ test_when_finished "git reset --hard" &&
+ echo content >bar &&
+ echo content >baz &&
+ echo content >saz &&
+ git add bar baz saz &&
+ git commit -m "bar baz saz" &&
+
+ echo content2 >bar &&
+ echo content2 >baz &&
+ echo content2 >saz &&
+ git commit -i bar saz -m "bar" &&
+ git diff --name-only >remaining &&
+ test_grep "baz" remaining
+'
+
+test_expect_success 'commit with -i includes staged changes' '
+ test_when_finished "git reset --hard" &&
+ echo content >bar &&
+ git add bar &&
+ git commit -m "bar" &&
+
+ echo content2 >bar &&
+ echo content2 >baz &&
+ git add baz &&
+ git commit -i bar -m "bar 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 'commit with -o' '
+ echo content >bar &&
+ git add bar &&
+ git commit -m "bar" &&
+ echo content2 >bar &&
+ git commit -o bar -m "bar again"
+'
+
+test_expect_success 'commit with -o fails with untracked files' '
+ test_when_finished "rm -rf testdir" &&
+ git init testdir &&
+ echo content >testdir/bar &&
+ test_must_fail git -C testdir commit -o bar -m "bar"
+'
+
+test_expect_success 'commit with -o exludes staged changes' '
+ test_when_finished "git reset --hard" &&
+ echo content >bar &&
+ echo content >baz &&
+ git add . &&
+ git commit -m "bar baz" &&
+
+ echo content2 >bar &&
+ echo content2 >baz &&
+ git add baz &&
+ git commit -o bar -m "bar" &&
+ git diff --name-only --staged >actual &&
+ test_grep "baz" actual
+'
+
+test_expect_success 'commit with both -i and -o fails' '
+ test_when_finished "git reset --hard" &&
+ echo content >bar &&
+ echo content >baz &&
+ git add . &&
+ git commit -m "bar baz" &&
+
+ echo content2 >bar &&
+ echo content2 >baz &&
+ test_must_fail git commit -i baz -o bar -m "bar"
+'
+
test_expect_success '--dry-run fails with nothing to commit' '
test_must_fail git commit -m initial --dry-run
'
--
2.43.0
next prev parent reply other threads:[~2024-01-09 6:10 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 6:04 [PATCH 0/2][GSOC] t7501: Add tests for various index usages, -i and -o, of commit command and amending commit to add signoff Ghanshyam Thakkar
2024-01-09 6:04 ` Ghanshyam Thakkar [this message]
2024-01-09 9:20 ` [PATCH 1/2] t7501: Add tests for various index usages, -i and -o, of commit command Christian Couder
2024-01-09 17:10 ` Ghanshyam Thakkar
2024-01-09 17:35 ` Junio C Hamano
2024-01-09 6:04 ` [PATCH 2/2] t7501: Add test for amending commit to add signoff Ghanshyam Thakkar
2024-01-09 10:44 ` Phillip Wood
2024-01-09 17:24 ` Ghanshyam Thakkar
2024-01-09 17:45 ` Junio C Hamano
2024-01-09 9:32 ` [PATCH 0/2][GSOC] t7501: Add tests for various index usages, -i and -o, of commit command and " Christian Couder
2024-01-09 16:51 ` [PATCH v2 0/2] t7501: add tests for --include, --only, Ghanshyam Thakkar
2024-01-10 16:35 ` [PATCH v3 0/2] t7501: add tests for --include, --only and Ghanshyam Thakkar
2024-01-12 18:00 ` [PATCH v4 0/2] t7501: add tests for --include, --only, --signoff Ghanshyam Thakkar
2024-01-12 18:00 ` [PATCH v4 1/2] t7501: add tests for --include and --only Ghanshyam Thakkar
2024-01-12 23:10 ` Junio C Hamano
2024-01-13 1:00 ` Ghanshyam Thakkar
2024-01-13 1:16 ` Junio C Hamano
2024-01-13 1:47 ` Ghanshyam Thakkar
2024-01-12 18:00 ` [PATCH v4 2/2] t7501: add tests for --amend --signoff Ghanshyam Thakkar
2024-01-13 4:21 ` [PATCH v5 0/2] t7501: add tests for --include, --only, --signoff Ghanshyam Thakkar
2024-01-13 4:21 ` [PATCH v5 1/2] t7501: add tests for --include and --only Ghanshyam Thakkar
2024-01-16 15:41 ` Junio C Hamano
2024-01-16 15:56 ` Junio C Hamano
2024-01-13 4:21 ` [PATCH v5 2/2] t7501: add tests for --amend --signoff Ghanshyam Thakkar
2024-01-17 16:13 ` [PATCH v6 0/2] t7501: add tests for --include, --only, --signoff Ghanshyam Thakkar
2024-01-17 16:13 ` [PATCH v6 1/2] t7501: add tests for --include and --only Ghanshyam Thakkar
2024-01-17 16:13 ` [PATCH v6 2/2] t7501: add tests for --amend --signoff Ghanshyam Thakkar
2024-01-17 21:33 ` [PATCH v6 0/2] t7501: add tests for --include, --only, --signoff Junio C Hamano
2024-01-10 16:35 ` [PATCH v3 1/2] t7501: add tests for --include and --only Ghanshyam Thakkar
2024-01-10 18:37 ` Junio C Hamano
2024-01-11 1:58 ` Ghanshyam Thakkar
2024-01-11 16:33 ` phillip.wood123
2024-01-10 16:35 ` [PATCH v3 2/2] t7501: add tests for --amend --signoff Ghanshyam Thakkar
2024-01-11 16:30 ` phillip.wood123
2024-01-09 16:51 ` [PATCH v2 1/2] t7501: add tests for --include, --only of commit Ghanshyam Thakkar
2024-01-09 17:50 ` Junio C Hamano
2024-01-09 16:51 ` [PATCH v2 2/2] t7501: add test for --amend with --signoff Ghanshyam Thakkar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240109060417.1144647-3-shyamthakkar001@gmail.com \
--to=shyamthakkar001@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).