From: Jeff King <peff@peff.net>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Piotr Krukowiecki" <piotr.krukowiecki@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH] i18n: use test_i18ncmp in t2020 (checkout --detach)
Date: Fri, 13 Apr 2012 19:30:10 -0400 [thread overview]
Message-ID: <20120413233010.GA16663@sigill.intra.peff.net> (raw)
In-Reply-To: <20120413225901.GA13220@burratino>
On Fri, Apr 13, 2012 at 05:59:01PM -0500, Jonathan Nieder wrote:
> When v1.7.5-rc0~19^2~1 (checkout: clear commit marks after detached-orphan
> check, 2011-03-20) added a check that the human-readable message
>
> Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
>
> is not suppressed by a previous commit walk, it forgot that the
> message might be different when git is configured to write output in
> another language. Skip the output check in that case.
I think it is not "forgot" but "predates" in this case. The commit
introducing the problem is 8a5b749 (i18n: format_tracking_info "Your
branch is behind" message, 2012-02-02). But obviously your fix is
correct either way.
> ---
> Hi,
>
> Jeff King wrote:
>
> > When leaving a detached HEAD, we do a revision walk to make
> > sure the commit we are leaving isn't being orphaned.
> > However, this leaves crufty marks in the commit objects
> > which can confuse later walkers, like the one in
> > stat_tracking_info.
> >
> > Let's clean up after ourselves to prevent this conflict.
>
> Very nice thing to do. Thanks.
A minor complaint, but the format of your email left me confused for
several minutes, as I didn't remember writing that or working in this
area recently. It turns out that it is because this commit was from over
a year ago.
-Peff
next prev parent reply other threads:[~2012-04-13 23:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-19 21:53 [bug] git checkout lies about number of ahead commits when switching from detached HEAD Piotr Krukowiecki
2011-03-19 22:28 ` Jeff King
2011-03-19 22:47 ` Jeff King
2011-03-20 0:35 ` Junio C Hamano
2011-03-20 9:01 ` Jeff King
2011-03-20 9:04 ` [PATCH 1/3] checkout: add basic tests for detached-orphan warning Jeff King
2011-03-20 9:09 ` [PATCH 2/3] checkout: clear commit marks after detached-orphan check Jeff King
2011-03-20 19:05 ` Junio C Hamano
2012-04-13 22:59 ` [PATCH] i18n: use test_i18ncmp in t2020 (checkout --detach) Jonathan Nieder
2012-04-13 23:25 ` [PATCH/RFC] checkout --detached test: write supporting files before start of tests Jonathan Nieder
2012-04-13 23:33 ` Jeff King
2012-04-13 23:49 ` Jonathan Nieder
2012-04-14 2:26 ` Jeff King
2012-04-13 23:30 ` Jeff King [this message]
2012-04-13 23:46 ` [PATCH] i18n: use test_i18ncmp in t2020 (checkout --detach) Jonathan Nieder
2012-04-14 2:24 ` Jeff King
2012-04-14 4:44 ` [PATCH v2 0/3] " Jonathan Nieder
2012-04-14 4:45 ` [PATCH 1/3] test: do not rely on US English tracking-info messages Jonathan Nieder
2012-04-14 4:46 ` [PATCH 2/3] test: use test_i18ncmp for "Patch format detection failed" message Jonathan Nieder
2012-04-14 4:48 ` [PATCH 3/3] test: am of empty patch should not succeed Jonathan Nieder
2012-04-14 8:15 ` [PATCH v2 0/3] Re: i18n: use test_i18ncmp in t2020 (checkout --detach) Jeff King
2012-04-14 5:02 ` [PATCH] " Jonathan Nieder
2012-04-14 8:22 ` Jeff King
2012-04-14 12:47 ` Jonathan Nieder
2011-03-20 9:19 ` [PATCH 3/3] checkout: tweak detached-orphan warning format Jeff King
2011-03-20 19:00 ` [bug] git checkout lies about number of ahead commits when switching from detached HEAD Junio C Hamano
2011-03-21 10:35 ` Jeff King
2011-03-21 15:17 ` Junio C Hamano
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=20120413233010.GA16663@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=piotr.krukowiecki@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.