From: Jeff King <peff@peff.net>
To: Alexander Shopov <ash@kambanaria.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Git List <git@vger.kernel.org>,
martin.agren@gmail.com, bmwill@google.com,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Xin Jiang <worldhello.net@gmail.com>,
Johannes Sixt <j6t@kdbg.org>,
Eric Sunshine <sunshine@sunshineco.com>,
pclouds@gmail.com
Subject: Re: [PATCH 1/1] Mark messages for translations
Date: Mon, 12 Feb 2018 10:15:00 -0500 [thread overview]
Message-ID: <20180212151500.GA21208@sigill.intra.peff.net> (raw)
In-Reply-To: <CAP6f5MnjhyP+Ty4zqS3sP2mgYfK3RiKm3=YpFE3LABxx7nUBkw@mail.gmail.com>
On Mon, Feb 12, 2018 at 04:03:49PM +0100, Alexander Shopov wrote:
> @Jeff:
> > we may want to avoid this anti-pattern
> Current state of these tests is wrong and I should rework them.
>
> Here is what I intend to do:
> 1. Fix the commit message
> 2. Check whether I can get the tests in t0002-gitfile.sh to the
> standard `test_i18ngrep !` negative (i.e. without using `if`)
> 3. Post and ask for feedback again
See the patch I posted earlier. For (2), "test_i18ngrep !" would be the
wrong thing. I think you should either:
- keep your patch as-is, and let Junio resolve the conflict when the
two are merged
- rebase your patch on top of mine. That's slightly less work for
Junio, but it means that your topic cannot graduate until mine does
(though hopefully mine is pretty non-controversial).
I'd probably just do the first in your place, since the conflict is easy
to resolve.
-Peff
next prev parent reply other threads:[~2018-02-12 15:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 5:44 [PATCH 0/1] Marked end user messages for translation Alexander Shopov
2018-01-15 5:44 ` [PATCH 1/1] Mark messages for translations Alexander Shopov
2018-01-15 7:33 ` Johannes Sixt
[not found] ` <CAP6f5Mnn+pRdL6ihgwcqsTwyGy+EQfBbgPxkFmGLcWL-hJx-8g@mail.gmail.com>
[not found] ` <CAP6f5MnaMiqEMbGW_xj6X495jF=txpzeq+DEHOkz7VCg2D6D9w@mail.gmail.com>
2018-01-15 9:16 ` Alexander Shopov
2018-01-15 9:58 ` Eric Sunshine
2018-01-15 10:21 ` Duy Nguyen
2018-02-06 6:15 ` [PATCH 0/1] " Alexander Shopov
2018-02-06 6:15 ` [PATCH 1/1] " Alexander Shopov
2018-02-06 7:32 ` Eric Sunshine
2018-02-06 7:38 ` Jeff King
2018-02-09 7:44 ` [PATCH 0/1] " Alexander Shopov
2018-02-09 7:44 ` [PATCH 1/1] " Alexander Shopov
2018-02-09 18:20 ` Junio C Hamano
2018-02-09 19:15 ` Junio C Hamano
2018-02-09 19:30 ` Jeff King
2018-02-10 11:31 ` [PATCH] t0002: simplify error checking Jeff King
2018-02-12 15:03 ` [PATCH 1/1] Mark messages for translations Alexander Shopov
2018-02-12 15:15 ` Jeff King [this message]
2018-02-13 13:19 ` [PATCH 0/1] Mark messages for translation Alexander Shopov
2018-02-13 13:19 ` [PATCH 1/1] Mark messages for translations Alexander Shopov
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=20180212151500.GA21208@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=ash@kambanaria.org \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=martin.agren@gmail.com \
--cc=pclouds@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.com \
--cc=worldhello.net@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).