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

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 +

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

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

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 >

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-dev] git review -d + git rebase changing author?

2017-07-17 Thread Matt Riedemann
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 Wher