Ramkumar Ramachandra wrote:
> Enable future callers to report a conflict and not die immediately by
> introducing a new function called error_resolve_conflict.
> Re-implement die_resolve_conflict as a call to error_resolve_conflict
> followed by a call to die. Consequently, the message printed by
> die_resolve_conflict changes from
>
> fatal: 'commit' is not possible because you have unmerged files.
> Please, fix them up in the work tree ...
> ...
>
> to
>
> error: 'commit' is not possible because you have unmerged files.
> hint: Please, fix them up in the work tree ...
> hint: ...
> fatal: Exiting because of an unresolved conflict.
Thanks! Personally, I like it (since the tags on the left make it a
little clearer to the reader what is happening).
> --- a/advice.c
> +++ b/advice.c
> @@ -19,6 +19,15 @@ static struct {
> { "detachedhead", &advice_detached_head },
> };
>
> +static void advise(const char *advice, ...)
> +{
> + va_list params;
> +
> + va_start(params, advice);
> + vreportf("hint: ", advice, params);
> + va_end(params);
> +}
Rather than copy+pasting this code verbatim, wouldn't it make sense to
move it and expose it through advice.h so the old call site can use
the same code?
For what it's worth, with that change,
Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html