From: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, phillip.wood123@gmail.com,
Ghanshyam Thakkar <shyamthakkar001@gmail.com>
Subject: [PATCH v2 1/2] t7501: add tests for --include, --only of commit
Date: Tue, 9 Jan 2024 22:21:21 +0530 [thread overview]
Message-ID: <20240109165304.8027-4-shyamthakkar001@gmail.com> (raw)
In-Reply-To: <20240109060417.1144647-2-shyamthakkar001@gmail.com>
This commit adds tests for testing --include (-o) and --only (-o). It
include 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, they
are only tested in combination with --amend --allow-empty and to-be-born
branch, and not for testing --only separately.
Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
---
A single test also exists in t1092-sparse-checkout-compatibility.sh
named "commit including unstaged changes" for --include, however, that
compares the results of sparse-checkout with full-checkout when using
--include and is not necessarily for testing --include itself. Otherthan
that, I could not find any other test for --include.
t/t7501-commit-basic-functionality.sh | 55 ++++++++++++++++++++++++++-
1 file changed, 54 insertions(+), 1 deletion(-)
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh
index 3d8500a52e..9325db1f66 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@redhat.com>
#
-# 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,59 @@ 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 baz -m initial
+'
+
+test_expect_success 'commit --include' '
+ test_when_finished "rm -rf remaining" &&
+ echo content >file &&
+ git commit --include file -m "file" &&
+ git diff --name-only >remaining &&
+ test_must_be_empty remaining
+'
+
+test_expect_success '--include with staged changes' '
+ echo newcontent >baz &&
+ echo newcontent >file &&
+ git add file &&
+ git commit --include baz -m "file 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 --only' '
+ echo change >file &&
+ git commit --only file -m "file" &&
+ git diff --name-only >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success '--only fails with untracked files' '
+ echo content >newfile &&
+ test_must_fail git commit --only newfile -m "newfile"
+'
+
+test_expect_success '--only excludes staged changes' '
+ echo content >file &&
+ echo content >baz &&
+ git add baz &&
+ git commit --only file -m "file" &&
+ git diff --name-only --staged >actual &&
+ test_grep "baz" actual
+'
+
+test_expect_success '--include and --only together fails' '
+ test_when_finished "git reset --hard" &&
+ echo new >file &&
+ echo new >baz &&
+ test_must_fail git commit --include baz --only bar -m "bar"
+'
+
test_expect_success 'amend commit' '
cat >editor <<-\EOF &&
#!/bin/sh
--
2.43.0
next prev parent reply other threads:[~2024-01-09 17:01 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 ` [PATCH 1/2] t7501: Add tests for various index usages, -i and -o, of commit command Ghanshyam Thakkar
2024-01-09 9:20 ` 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 ` Ghanshyam Thakkar [this message]
2024-01-09 17:50 ` [PATCH v2 1/2] t7501: add tests for --include, --only of commit 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=20240109165304.8027-4-shyamthakkar001@gmail.com \
--to=shyamthakkar001@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/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).