From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: "Stephen P. Smith" <ischis2@cox.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/3] Add test for commit --dry-run --short.
Date: Sat, 1 Sep 2018 13:55:21 +0200 [thread overview]
Message-ID: <20180901115521.GA18536@localhost> (raw)
In-Reply-To: <20180831053921.8083-3-ischis2@cox.net>
On Thu, Aug 30, 2018 at 10:39:20PM -0700, Stephen P. Smith wrote:
> 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
I think the last line of the comment is unnecessary: it doesn't say
anything that is not obvious from the test's last line.
> + rm -f test-file &&
> + touch testfile &&
That filename should be 'test-file', i.e. with a dash, shouldn't it?
Anyway, if you want to truncate the file, then please use '>test-file'
instead of 'rm' and 'touch'.
> + git add test-file &&
> + git commit --dry-run --short
> +'
> +
> test_done
> --
> 2.18.0
>
next prev parent reply other threads:[~2018-09-01 11:55 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 ` [PATCH 2/3] Add test for commit --dry-run --short Stephen P. Smith
2018-08-31 7:18 ` Æ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 [this message]
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=20180901115521.GA18536@localhost \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ischis2@cox.net \
/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.