Re: [RFC/PATCH] commit: make the error message on unmerged entries user-friendly.
- From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
- Date
- Jan 6, 2010, 19:53 UTC
- Message-ID
- <vpqocl76mdo.fsf@bauges.imag.fr>
- In-Reply-To
- <7v8wcbw14f.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
>> # Unmerged paths: >> # (use "git add/rm <file>..." as appropriate to mark resolution)
[...]
> That one line we see above is concise and does mention "rm" as > well. Why not use it?
Fine, you convinced me. I was thinking of a longer sentence, but "/rm" doesn't harm.
Show 7 quoted lines
>>> I think we should consolidate them all. >> >> Right, although "commit" is definitely the most important (dumb users >> don't need "git merge"). > > Your "dumb users" don't get the unmerged error from commit, either, if > they don't need "git merge".
They'd use "pull", not merge. Anyway, I did it for commit, merge, pull, revert, cherry-pick. I guess we covered the common cases. The patch seems to have a lot of redundancies, but I think trying to factor this into helper functions would be much more effort than the few cut-and-paste that I had to do, since each instance is a slight variant of each other ...
Patch follows. Let me know in case you prefer to split it.
-- Matthieu Moy http://www-verimag.imag.fr/~moy/