Re: [PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 12, 2017, 06:28 UTC
- Message-ID
- <xmqqtw4q6122.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20170511190809.GB12516@aiede.svl.corp.google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 12 quoted lines
>> @@ -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).