From: "Stephen P. Smith" <ischis2@cox.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
"Stephen P. Smith" <ischis2@cox.net>
Subject: [PATCH 2/3] Add test for commit --dry-run --short.
Date: Thu, 30 Aug 2018 22:39:20 -0700 [thread overview]
Message-ID: <20180831053921.8083-3-ischis2@cox.net> (raw)
In-Reply-To: <20180831053921.8083-1-ischis2@cox.net>
Add test for commit with --dry-run --short for a new file of zero
length.
The test demonstrated that the setting of the commitable flag was
broken as was found durning an earlier patch review.
Signed-off-by: Stephen P. Smith <ischis2@cox.net>
---
t/t7501-commit.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 810d4cea7..fc69da816 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -682,4 +682,14 @@ test_expect_success '--dry-run with conflicts fixed from a merge' '
git commit -m "conflicts fixed from merge."
'
+test_expect_success '--dry-run --short with conflicts fixed from a merge' '
+ # setup two branches with conflicting information
+ # in the same file, resolve the conflict,
+ # call commit with --dry-run --short
+ rm -f test-file &&
+ touch testfile &&
+ git add test-file &&
+ git commit --dry-run --short
+'
+
test_done
--
2.18.0
next prev parent reply other threads:[~2018-08-31 5:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 5:39 [PATCH 0/3] wt-status.c: commitable flag Stephen P. Smith
2018-08-31 5:39 ` [PATCH 1/3] Change tests from expecting to fail to expecting success Stephen P. Smith
2018-08-31 7:17 ` Ævar Arnfjörð Bjarmason
2018-08-31 5:39 ` Stephen P. Smith [this message]
2018-08-31 7:18 ` [PATCH 2/3] Add test for commit --dry-run --short Ævar Arnfjörð Bjarmason
2018-08-31 16:26 ` Junio C Hamano
2018-08-31 17:58 ` Stephen & Linda Smith
2018-09-01 11:55 ` SZEDER Gábor
2018-08-31 5:39 ` [PATCH 3/3] wt-status.c: Set the commitable flag in the collect phase Stephen P. Smith
2018-08-31 7:23 ` Ævar Arnfjörð Bjarmason
2018-08-31 16:54 ` Junio C Hamano
2018-08-31 18:13 ` Stephen & Linda Smith
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=20180831053921.8083-3-ischis2@cox.net \
--to=ischis2@cox.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).