git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Pete Wyckoff <pw@padd.com>,
	Luke Diamand <luke@diamand.org>
Subject: [PATCH/RFC v2 0/2] git-p4: user preservation improvements
Date: Mon,  9 May 2011 07:40:01 +0100	[thread overview]
Message-ID: <1304923203-26278-1-git-send-email-luke@diamand.org> (raw)

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(-)

             reply	other threads:[~2011-05-09  6:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-09  6:40 Luke Diamand [this message]
2011-05-09  6:40 ` [PATCH/RFC v2 1/2] git-p4: small improvements to user-preservation Luke Diamand
2011-05-09  6:40   ` [PATCH/RFC v2 2/2] git-p4: warn if git authorship won't be retained Luke Diamand
2011-05-09 22:39     ` Pete Wyckoff
2011-05-09 22:30   ` [PATCH/RFC v2 1/2] git-p4: small improvements to user-preservation Pete Wyckoff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1304923203-26278-1-git-send-email-luke@diamand.org \
    --to=luke@diamand.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pw@padd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).