From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Jean-Noel Avila <jn.avila@free.fr>, git@vger.kernel.org
Subject: Re: [PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck
Date: Fri, 12 May 2017 15:28:53 +0900 [thread overview]
Message-ID: <xmqqtw4q6122.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170511190809.GB12516@aiede.svl.corp.google.com> (Jonathan Nieder's message of "Thu, 11 May 2017 12:08:09 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
>> @@ -226,9 +226,10 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
>> setup_work_tree();
>>
>> if (opts.merge) {
>> - if (stage < 2)
>> - die("just how do you expect me to merge %d trees?", stage-1);
>> switch (stage - 1) {
>> + case 0:
>> + die(_("you must specify at least one tree to merge"));
>> + break;
>
> This part looks good.
Thanks. Modulo _(""); I do not think other messages from read-tree
are marked for i18n (yet).
next prev parent reply other threads:[~2017-05-12 6:28 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 16:29 [PATCH 1/4] usability: don't ask questions if no reply is required Jean-Noel Avila
2017-05-03 16:29 ` [PATCH 2/4] usability: fix am and checkout for nevermind questions Jean-Noel Avila
2017-05-03 16:51 ` Jonathan Nieder
2017-05-03 18:35 ` Jean-Noël AVILA
2017-05-03 16:29 ` [PATCH 3/4] read-tree.c: rework UI when merging no trees Jean-Noel Avila
2017-05-03 17:04 ` Jonathan Nieder
2017-05-03 18:39 ` Jean-Noël AVILA
2017-05-03 16:29 ` [PATCH 4/4] git-filter-branch: be assertative on dying message Jean-Noel Avila
2017-05-03 17:07 ` Jonathan Nieder
2017-05-03 16:47 ` [PATCH 1/4] usability: don't ask questions if no reply is required Jonathan Nieder
2017-05-03 16:58 ` Stefan Beller
2017-05-03 17:37 ` Jean-Noël AVILA
2017-05-03 21:07 ` [PATCH v2 1/3] " Jean-Noel Avila
2017-05-03 21:07 ` [PATCH v2 2/3] read-tree -m: make error message for merging 0 trees less smart aleck Jean-Noel Avila
2017-05-11 3:46 ` Junio C Hamano
2017-05-11 4:31 ` [PATCH] read-tree: "read-tree -m --empty" does not make sense Junio C Hamano
2017-05-03 21:07 ` [PATCH v2 3/3] git-filter-branch: make the error msg when missing branch more open Jean-Noel Avila
2017-05-11 3:53 ` Junio C Hamano
2017-05-04 8:52 ` [PATCH v2 1/3] usability: don't ask questions if no reply is required Kerry, Richard
2017-05-04 9:09 ` Ævar Arnfjörð Bjarmason
2017-05-04 10:14 ` Kerry, Richard
2017-05-09 8:18 ` Jean-Noël AVILA
2017-05-09 9:21 ` Ævar Arnfjörð Bjarmason
2017-05-04 9:41 ` Jean-Noël AVILA
2017-05-11 3:16 ` Junio C Hamano
2017-05-11 10:10 ` Kerry, Richard
2017-05-11 10:28 ` Konstantin Khomoutov
2017-05-11 10:33 ` Ævar Arnfjörð Bjarmason
2017-05-11 12:06 ` [PATCH v3 " Jean-Noel Avila
2017-05-11 12:06 ` [PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck Jean-Noel Avila
2017-05-11 19:08 ` Jonathan Nieder
2017-05-12 6:28 ` Junio C Hamano [this message]
2017-05-12 12:54 ` Jean-Noël AVILA
2017-05-11 12:06 ` [PATCH v3 3/3] git-filter-branch: Jean-Noel Avila
2017-05-12 6:27 ` Junio C Hamano
2017-05-12 13:03 ` [PATCH v4 1/3] usability: don't ask questions if no reply is required Jean-Noel Avila
2017-05-12 13:03 ` [PATCH v4 2/3] read-tree -m: make error message for merging 0 trees less smart aleck Jean-Noel Avila
2017-05-12 13:03 ` [PATCH v4 3/3] git-filter-branch: be more direct in an error message Jean-Noel Avila
2017-05-12 22:36 ` [PATCH v4 1/3] usability: don't ask questions if no reply is required Junio C Hamano
2017-05-13 15:37 ` Johannes Sixt
2017-05-15 2:18 ` 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=xmqqtw4q6122.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
--cc=jrnieder@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.