Junio suggested that git-p4 should warn people about username lossage in a more sensible way. This pair of changes is an attempt to do that. (a) The first change is a few small improvements to git-p4, but without spurious warnings (a bit more paranoid, get rid of a superfluous -G and don't bother to change the user if it's already correct). (b) The second change adds a warning to the commit message if the authorship (based on git email vs p4 email) is going to be lost and the user is *not* using --preserve-user. The warning can be suppressed with a git config option. Luke Diamand (2): git-p4: small improvements to user-preservation git-p4: warn if git authorship won't be retained contrib/fast-import/git-p4 | 49 ++++++++++++++++++++++++++++++++++----- contrib/fast-import/git-p4.txt | 16 +++++++++--- t/t9800-git-p4.sh | 46 +++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 11 deletions(-) -- 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