From: "Stephen P. Smith" <ischis2@cox.net>
To: Git Mailing List <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 2/3] Add test for commit --dry-run --short.
Date: Sat, 1 Sep 2018 16:52:55 -0700 [thread overview]
Message-ID: <20180901235256.4260-3-ischis2@cox.net> (raw)
In-Reply-To: <20180901235256.4260-1-ischis2@cox.net>
Add test for commit with --dry-run --short for a new file of zero
length.
The test demonstrates that the setting of the commitable flag is
broken.
Signed-off-by: Stephen P. Smith <ischis2@cox.net>
---
t/t7501-commit.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 4cae92804..5812dc2f8 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -682,4 +682,12 @@ test_expect_success '--dry-run with conflicts fixed from a merge' '
git commit -m "conflicts fixed from merge."
'
+test_expect_failure '--dry-run --short' '
+ # setup two branches with conflicting information
+ # in the same file, resolve the conflict
+ >test-file &&
+ git add test-file &&
+ git commit --dry-run --short
+'
+
test_done
--
2.18.0
next prev parent reply other threads:[~2018-09-01 23:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-01 23:52 [PATCH v2 0/3] wt-status.c: commitable flag Stephen P. Smith
2018-09-01 23:52 ` [PATCH v2 1/3] wt-status.c: Move has_unmerged earlier in the file Stephen P. Smith
2018-09-01 23:52 ` Stephen P. Smith [this message]
2018-09-02 2:18 ` [PATCH v2 2/3] Add test for commit --dry-run --short Eric Sunshine
2018-09-02 2:22 ` Eric Sunshine
2018-09-02 5:17 ` Stephen & Linda Smith
2018-09-01 23:52 ` [PATCH v2 3/3] wt-status.c: Set the commitable flag in the collect phase Stephen P. 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=20180901235256.4260-3-ischis2@cox.net \
--to=ischis2@cox.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.