Some user-facing porcelain messages in Git are hard to understand and hard to translate. They confuse users winthout providing proper information and course of action. Here is the list of these messages (starting with "-") and my suggestions (starting with "+"). The patch follows in the next letter.
-Huh (%s)? +Wrong choice (%s). Choose again. -Clever... amending the last one with dirty index. +You are amending the last commit only. There are additional changes in the index. -confusion beyond insanity in parse_pack_objects() +fatal error in function "parse_pack_objects". This is a bug in Git. Please report it to the developers with an e-mail to git@vger.kernel.org. -confusion beyond insanity +fatal error in function "conclude_pack". This is a bug in Git. Please report it to the developers with an e-mail to git@vger.kernel.org. -insane in-reply-to: %s +wrong format for the "in-reply-to" header: %s -Two output directories? +Maximum one output directory is allowed. -Wonderful.\n +The first part of the trivial merge finished successfully.\n -Nope.\n +Merge was not successful.\n - ??? + unknown state -no tag message? +missing tag message -?? what are you talking about? +unknown command. Only "start", "good", "bad" and "skip" are possible. -Unprocessed path??? %s +The path "%s" was not processed but it had to be. This is a bug in Git. Please report it to the developers with an e-mail to git@vger.kernel.org. Alexander Shopov (1): Fixing unclear messages builtin/clean.c | 2 +- builtin/commit.c | 2 +- builtin/index-pack.c | 4 ++-- builtin/log.c | 4 ++-- builtin/merge.c | 5 +++-- builtin/remote.c | 2 +- builtin/tag.c | 2 +- git-bisect.sh | 2 +- merge-recursive.c | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
