threads / discuss / 29183

git-p4 using notes

Subject: git-p4 using notes

## tl;dr

3 messages between Dec 16, 2011 and Dec 17, 2011.

replies: 2people: 2as markdown or json

Michael Horowitz· Dec 16, 2011, 16:07 UTC · lore

For those of you using git-p4 because of a company requirement to use Perforce, but really wish you could use git only, the most frustrating part is the fact that when changes are submitted, the commit message is rewritten to include a reference to the P4 change number which is used by the sync. When syncing back changes, this causes the commit hash to be different, and so blows away your old commit and any parent commit references and such.

I read someplace, I can't remember where at this point, that if git-p4 used notes to write the P4 change information, that would not impact the commit hash, so when merging back, things would not be overwritten, and you can maintain branches and commit history properly in git.

I just ran into this project, where it seems that someone has re-written git-p4 to use notes: https://github.com/ermshiperete/git-p4

I was wondering if any of the maintainers of git-p4 has considered this, and might want to leverage this work to merge into the main git repo, possibly with an option to choose between the two behaviors.

Thanks,

Mike

Luke Diamand· Dec 16, 2011, 19:55 UTC · re: Michael Horowitz · lore

Re: git-p4 using notes

On 16/12/11 16:07, Michael Horowitz wrote:

Show 20 quoted lines

> For those of you using git-p4 because of a company requirement to use
> Perforce, but really wish you could use git only, the most frustrating
> part is the fact that when changes are submitted, the commit message
> is rewritten to include a reference to the P4 change number which is
> used by the sync.  When syncing back changes, this causes the commit
> hash to be different, and so blows away your old commit and any parent
> commit references and such.
>
> I read someplace, I can't remember where at this point, that if git-p4
> used notes to write the P4 change information, that would not impact
> the commit hash, so when merging back, things would not be
> overwritten, and you can maintain branches and commit history properly
> in git.
>
> I just ran into this project, where it seems that someone has
> re-written git-p4 to use notes: https://github.com/ermshiperete/git-p4
>
> I was wondering if any of the maintainers of git-p4 has considered
> this, and might want to leverage this work to merge into the main git
> repo, possibly with an option to choose between the two behaviors.

I'm not sure I qualify for such a grand title as maintainer, but I was going to give this a go in the new year as it would be quite useful, unless someone beat me to it. I want to fix some problems with labels first though.

Regards! Luke

Michael Horowitz· Dec 17, 2011, 00:57 UTC · re: Luke Diamand · lore

Re: git-p4 using notes

That would be great. If you need me to help test, let me know. Unfortunately I don't know Python and I know very little about the internals of git, so I can't help much more than that...

Mike

On Fri, Dec 16, 2011 at 2:55 PM, Luke Diamand <luke@diamand.org> wrote:

Show 30 quoted lines

> On 16/12/11 16:07, Michael Horowitz wrote:
>>
>> For those of you using git-p4 because of a company requirement to use
>> Perforce, but really wish you could use git only, the most frustrating
>> part is the fact that when changes are submitted, the commit message
>> is rewritten to include a reference to the P4 change number which is
>> used by the sync.  When syncing back changes, this causes the commit
>> hash to be different, and so blows away your old commit and any parent
>> commit references and such.
>>
>> I read someplace, I can't remember where at this point, that if git-p4
>> used notes to write the P4 change information, that would not impact
>> the commit hash, so when merging back, things would not be
>> overwritten, and you can maintain branches and commit history properly
>> in git.
>>
>> I just ran into this project, where it seems that someone has
>> re-written git-p4 to use notes: https://github.com/ermshiperete/git-p4
>>
>> I was wondering if any of the maintainers of git-p4 has considered
>> this, and might want to leverage this work to merge into the main git
>> repo, possibly with an option to choose between the two behaviors.
>
>
> I'm not sure I qualify for such a grand title as maintainer, but I was going
> to give this a go in the new year as it would be quite useful, unless
> someone beat me to it. I want to fix some problems with labels first though.
>
> Regards!
> Luke