git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pete Wyckoff <pw@padd.com>
To: Michael Horowitz <mike@horowitz.name>
Cc: git <git@vger.kernel.org>
Subject: Re: git-p4: Jobs and skipSubmitEdit
Date: Tue, 17 Jul 2012 21:03:04 -0400	[thread overview]
Message-ID: <20120718010304.GA24602@padd.com> (raw)
In-Reply-To: <CAFLRbooDpeE0U+sysa=OZ2a1sPvPo9MYTi4KLRgfJxkxw2HQyw@mail.gmail.com>

mike@horowitz.name wrote on Tue, 17 Jul 2012 04:49 -0400:
> I gave the patch a try, and it seems to work great.
> 
> Only problem I realized is that it means that the git commit message
> and the p4 log message end up different, because to p4 the jobs lines
> are special and get stripped out, but in git it just stays part of the
> commit message.  So, when you do a p4 sync/rebase, the commits come
> back without it.  This doesn't make much of difference now, because
> the commit messages come back modified with the p4 path and changelist
> number anyway, but if Luke tries to do that change to store the p4
> path/changelist in notes instead, then we wouldn't want any
> differences in the commit messages, because then the commits hashes
> won't match again.
> 
> Not sure what the best thing to do here is, but I guess it doesn't
> matter until this mythical notes thing happens.

Glad it works.

I didn't think about trying to make the commit messages exact.
That isn't required for, e.g. "git cherry", but might be nice
just to make git/p4 view of the changes more similar.

Okay if we wait and see how the notes stuff goes, like you
suggest.  Could be that Jobs ends up in a note too.

Thanks for testing.

		-- Pete

      reply	other threads:[~2012-07-18  1:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-22 16:15 git-p4: Jobs and skipSubmitEdit Michael Horowitz
2012-06-24 20:24 ` Pete Wyckoff
2012-06-26  5:07   ` Michael Horowitz
2012-06-26 11:21     ` Pete Wyckoff
2012-07-17  8:49       ` Michael Horowitz
2012-07-18  1:03         ` Pete Wyckoff [this message]

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=20120718010304.GA24602@padd.com \
    --to=pw@padd.com \
    --cc=git@vger.kernel.org \
    --cc=mike@horowitz.name \
    /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).