From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, John Keeping <john@keeping.me.uk>,
Lars Schneider <larsxschneider@gmail.com>
Subject: Re: [PATCH] t5533: make it pass on case-sensitive filesystems
Date: Thu, 04 Aug 2016 10:18:28 -0700 [thread overview]
Message-ID: <xmqqwpjw4fmj.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <93e1fb21d1d24c5b751e2d9d25d9220704bae5aa.1470322425.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Thu, 4 Aug 2016 16:54:35 +0200 (CEST)")
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> The newly-added test case wants to commit a file "c.t" (note the lower
> case) when a previous test case already committed a file "C.t". This
> confuses Git to the point that it thinks "c.t" was not staged when "git
> add c.t" was called.
>
> Simply make the naming of the test commits consistent with the previous
> test cases: use upper-case, and advance in the alphabet.
>
> This came up in local work to rebase the Windows-specific patches to the
> current `next` branch. An identical fix was suggested by John Keeping.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> Published-As: https://github.com/dscho/git/releases/tag/t5533-case-insensitive-v1
> Fetch-It-Via: git fetch https://github.com/dscho/git t5533-case-insensitive-v1
Thanks. It may make it easier to see to have a blank line here,
separating them from the diffstat.
> t/t5533-push-cas.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
> index 09899af..a2c9e74 100755
> --- a/t/t5533-push-cas.sh
> +++ b/t/t5533-push-cas.sh
> @@ -220,7 +220,7 @@ test_expect_success 'new branch already exists' '
> (
> cd src &&
> git checkout -b branch master &&
> - test_commit c
> + test_commit F
> ) &&
> (
> cd dst &&
Thanks.
> --
> 2.9.0.281.g286a8d9
>
> base-commit: 9813b109b4ec6630220e5f3d8aff275e23cba59e
A totally unrelated tangent.
This line turns out to be less than useful at least in this
particular case.
The fix is meant for jk/push-force-with-lease-creation topic, but I
had to find it out by the old fashioned way, i.e. running blame for
these lines in 'pu' to find eee98e74f9 is the culprit and then
running "git branch --with eee98e74f9". The only thing the line
made easier is I _could_ start the blame at the named commit (which
is on 'next') instead of 'pu'. When I took that "base-commit"
series, I was hoping that it would give us a lot more useful
information.
next prev parent reply other threads:[~2016-08-04 17:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-04 14:54 [PATCH] t5533: make it pass on case-sensitive filesystems Johannes Schindelin
2016-08-04 17:18 ` Junio C Hamano [this message]
2016-08-05 14:19 ` Johannes Schindelin
2016-08-08 11:21 ` Jeff King
2016-08-08 11:49 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwpjw4fmj.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=john@keeping.me.uk \
--cc=larsxschneider@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).