Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes:
> On Fri, May 8, 2015 at 12:53 PM, Ralf Thielow <ralf.thielow@xxxxxxxxx> wrote:
>> sequencer.c: abbreviate hashs placed in the middle of messages
>
> s/hashs/hashes/
> ...
>> + return error(_("Commit %s... is a merge but no -m option was
>> given."),
>> + find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
>
> Are short SHA1's followed by "..." anywhere else in the project? It
> seems strange to introduce such usage here.
There are (and used to be the norm), as in "git diff --raw", for
example.
But I doubt the value of pointing out exact commit in the first
place, which leads me to say that "no -m option was given but
history has a merge" might be a viable alternative.
If identifying the exact commit has value, on the other hand, we can
rephrase it like this:
error(_("no -m option was given to pick a merge '%s'", ...));
to place it not in the middle. We can do similar rephrasing for
other messages as well.
>> - return error(_("Commit %s does not have parent %d"),
>> - sha1_to_hex(commit->object.sha1), opts->mainline);
error(_("No parent %d for commit '%s'", opts->mainline, ...);
>> - return error(_("Mainline was specified but commit %s is not a merge."),
>> - sha1_to_hex(commit->object.sha1));
error(_("-m option was given for non-merge commit '%s'", ...);
--
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