Re: [PATCH v16 Part II 7/8] bisect--helper: `bisect_start` shell function partially in C

2018-02-15 Thread SZEDER Gábor
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index ab0580ce0089a..4ac175c49e80c 100644
> --- a/builtin/bisect--helper.c
> +++ b/builtin/bisect--helper.c

> + /*
> +  * Check if we are bisecting
> +  */
> + if (!is_empty_or_missing_file(git_path_bisect_start())) {
> + /* Reset to the rev from where we started */
> + strbuf_read_file(_head, git_path_bisect_start(), 0);
> + strbuf_trim(_head);
> + if (!no_checkout) {
> + struct argv_array argv = ARGV_ARRAY_INIT;
> +
> + argv_array_pushl(, "checkout", start_head.buf,
> +  "--", NULL);
> + if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
> + error(_("checking out '%s' failed. Try 'git "
> + "bisect start '."),
> +   start_head.buf);
> + goto fail;
> + }
> + }
> + } else {
> + /* Get the rev from where we start. */
> + if (!get_oid(head, _oid) &&
> + !starts_with(head, "refs/heads/")) {
> + strbuf_reset(_head);
> + strbuf_addstr(_head, sha1_to_hex(head_oid.hash));

Please use oid_to_hex(_oid) instead of sha1_to_hex().



Re: [PATCH v16 Part II 7/8] bisect--helper: `bisect_start` shell function partially in C

2017-10-30 Thread Pranit Bauva
Hey Stephan,

On Mon, Oct 30, 2017 at 10:21 PM, Stephan Beyer  wrote:
> Hi,
>
>> + return error(_("unrecognised option: '%s'"), arg);
>
> Please write "unrecogni_z_ed".
>
> Since the string for translation changed from
> "unrecognised option: '$arg'"
> to
> "unrecognised option: '%s'"
> anyway, it does not result in further work for the translators to
> correct it to
> "unrecognized option: '%s'"

Yeah Sure!

Regards,
Pranit Bauva


Re: [PATCH v16 Part II 7/8] bisect--helper: `bisect_start` shell function partially in C

2017-10-30 Thread Stephan Beyer
Hi,

> + return error(_("unrecognised option: '%s'"), arg);

Please write "unrecogni_z_ed".

Since the string for translation changed from
"unrecognised option: '$arg'"
to
"unrecognised option: '%s'"
anyway, it does not result in further work for the translators to
correct it to
"unrecognized option: '%s'"

Stephan