Open Stack

On Mon, Sep 29, 2014, at 12:34 PM, Sharan Kumar M wrote:
> Hi all,
> 
> I am getting some weird things when I try to submit a patch for review.
> May
> be I am doing something wrong.
> 
> I cloned the repo, setup git review and setup my gerrit username in git
> config. I updated an image in the docs/source/images directory and
> committed. After I commit, I get the git status report as
> 
> "Your branch and 'origin/master' have diverged,
> and have 1 and 1 different commit each, respectively."
> 
> When I see the log, the last commit is authored by
> jenkins at review.openstack.org with the same commit message as mine. The
> author name is supposed to be mine right? The last time I submitted for
> review, the commit message had my name as author.
> 
> Could someone help me out with this issue?
> Thanks,
> Sharan Kumar M
> _______________________________________________
> OpenStack-dev mailing list
> OpenStack-dev at lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

I think you may have amended the last commit that Gerrit merged rather
than creating a new commit. Did you run `git commit --amend` on top of
the last upstream commit?

If so the easiest way to fix this is probably to `git checkout master &&
git reset --hard origin/master` then make your changes and finally `git
commit` without the --amend.

Clark