Re: [openstack-dev] git review -d + git rebase changing author?

2017-09-14 Thread Jeremy Stanley 
On 2017-09-14 18:16:03 + (+), Jeremy Stanley wrote:
> On 2017-09-14 12:01:54 -0600 (-0600), Matt Riedemann wrote:
> [...]
> > I figured out the pattern when this happens to change the author.
> > 
> > 1. git review -d
> > 2. git rebase -i master
> > 3. 
> > 4. fix merge conflict
> > 5. git add 
> > 6. git commit
> > 7. git rebase --continue
> > 
> > It's the merge conflict + git commit during the rebase that changes the
> > author for me.
> 
> You ought to be able to completely skip #6 above. Continuing the
> rebase (at least in the releases of Git I use) will amend the commit
> correctly and give you the ability to adjust the commit message when
> it does so.

Also, I'll just put this here...

https://docs.openstack.org/infra/manual/developers.html#rebasing-a-commit

-- 
Jeremy Stanley


signature.asc
Description: Digital signature
__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] git review -d + git rebase changing author?

2017-09-14 Thread Jeremy Stanley 
On 2017-09-14 12:01:54 -0600 (-0600), Matt Riedemann wrote:
[...]
> I figured out the pattern when this happens to change the author.
> 
> 1. git review -d
> 2. git rebase -i master
> 3. 
> 4. fix merge conflict
> 5. git add 
> 6. git commit
> 7. git rebase --continue
> 
> It's the merge conflict + git commit during the rebase that changes the
> author for me.

You ought to be able to completely skip #6 above. Continuing the
rebase (at least in the releases of Git I use) will amend the commit
correctly and give you the ability to adjust the commit message when
it does so.
-- 
Jeremy Stanley


signature.asc
Description: Digital signature
__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] git review -d + git rebase changing author?

2017-09-14 Thread Matt Riedemann 

On 7/17/2017 6:31 PM, melanie witt wrote:

On Tue, 18 Jul 2017 09:22:31 +0900, Ghanshyam Mann wrote:

Yes, this is same case when we do fetch patch set using git checkout,
i do not think its something to do with gite review -d.


Doing that shouldn't change the author, at least in my experience. I 
constantly 'git fetch' or 'git review -d ' to fetch a patch, 
update it, and push a new revision. When I do that, the author stays the 
same but it shows me as the "Committer".


I have seen the behavior Matt describes happen to other people though 
and I would guess it has something to do with the rebase. Though I feel 
like I've also rebased other people's changes and it didn't change the 
Author, it only changed the Committer to me.


-melanie

__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev


I figured out the pattern when this happens to change the author.

1. git review -d
2. git rebase -i master
3. 
4. fix merge conflict
5. git add 
6. git commit
7. git rebase --continue

It's the merge conflict + git commit during the rebase that changes the 
author for me.


--

Thanks,

Matt

__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] git review -d + git rebase changing author?

2017-07-17 Thread melanie witt 

On Tue, 18 Jul 2017 09:22:31 +0900, Ghanshyam Mann wrote:

Yes, this is same case when we do fetch patch set using git checkout,
i do not think its something to do with gite review -d.


Doing that shouldn't change the author, at least in my experience. I 
constantly 'git fetch' or 'git review -d ' to fetch a patch, 
update it, and push a new revision. When I do that, the author stays the 
same but it shows me as the "Committer".


I have seen the behavior Matt describes happen to other people though 
and I would guess it has something to do with the rebase. Though I feel 
like I've also rebased other people's changes and it didn't change the 
Author, it only changed the Committer to me.


-melanie

__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] git review -d + git rebase changing author?

2017-07-17 Thread Ghanshyam Mann 
On Tue, Jul 18, 2017 at 8:24 AM, Matt Riedemann  wrote:
> I don't have a strict recreate on this right now, but wanted to bring it up
> in case others have seen it. I've done this unknowingly and seen it happen
> to other changes, like:
>
> https://review.openstack.org/#/c/428241/7..8//COMMIT_MSG
>
> https://review.openstack.org/#/c/327564/3..4//COMMIT_MSG
>
> Where the author changes in the commit.
>
> When I've seen this, I think it's because I'm doing some combination of:
>
> 1. git review -d
> 2. git rebase -i master
> 3. change something
> 4. git commit

Yes, this is same case when we do fetch patch set using git checkout,
i do not think its something to do with gite review -d. I usually do
mention author explicitly during git commit to keep the original
author.
git commit --author <>

> 5. git rebase --continue (if in the middle of a series)
> 6. git review
>
> Something about the combination of the git review/rebase/commit changes the
> author.
>
> Again, I can try to recreate and come up with repeatable steps later, but
> wanted to bring this up while I'm thinking about it again.
>
> My versions:
>
> user@ubuntu:~/git/nova$ git --version
> git version 2.7.4
> user@ubuntu:~/git/nova$ pip show git-review
> Name: git-review
> Version: 1.25.0
>
>
> --
>
> Thanks,
>
> Matt
>
> __
> OpenStack Development Mailing List (not for usage questions)
> Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] git review -d + git rebase changing author?

2017-07-17 Thread Jeremy Stanley 
On 2017-07-17 18:24:39 -0500 (-0500), Matt Riedemann wrote:
> I don't have a strict recreate on this right now, but wanted to bring it up
> in case others have seen it.
[...]

Any chance you can find the author change in your git reflog?
-- 
Jeremy Stanley

__
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev