git review error.

asked 2016-06-30 05:59:19 -0500

Muzammil gravatar image

I am a new contributor and working on my first contribution, a low prio bug. I fixed the code and ran tests which were ok. I also did the sandbox sample commits and they were ok too.

These are the commands I executed in my devstack envirnment. (omitting the fixing part)

git clone
cd watcher/
git review -s
git checkout -b 1597641
git config "my name"
git config "<my email id>"
git config user.editor "vi"
git commit
git commit
git review

Other commands are ok, even git review -s on git review

stack@devstack:~/watcher$ git review
Errors running git rebase -i remotes/gerrit/master
Cannot rebase: You have unstaged changes.
Please commit or stash them.

Any ideas what might be the problem?

edit retag flag offensive close merge delete

1 answer

Sort by ยป oldest newest most voted

answered 2016-07-01 02:13:46 -0500

Muzammil gravatar image

The problem was solved by 'git pull'

stack@devstack:~/watcher$ git pull
Updating dc01e35..ec64203
 README.rst                       | 2 +-
 doc/source/deploy/user-guide.rst | 2 +-
 doc/source/dev/environment.rst   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
stack@devstack:~/watcher$ git checkout -b 1597641
Switched to a new branch '1597641'
stack@devstack:~/watcher$ git status
On branch 1597641
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   watcher/db/
        modified:   watcher/db/sqlalchemy/

no changes added to commit (use "git add" and/or "git commit -a")
stack@devstack:~/watcher$ git add .
stack@devstack:~/watcher$ git status
On branch 1597641
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   watcher/db/
        modified:   watcher/db/sqlalchemy/

stack@devstack:~/watcher$ git commit
[1597641 b0e1ab3] removed column parameters from the following methods in both files     def get_audit_template_list(self, context, columns=None, filters=None,                                 limit=None, marker=None, sort_key=None,                                 sort_dir=None):
 2 files changed, 28 insertions(+), 225 deletions(-)
stack@devstack:~/watcher$ git review
remote: Processing changes: new: 1, refs: 1, done
remote: (W) b0e1ab3: commit subject >65 characters; use shorter first paragraph
remote: (W) b0e1ab3: too many commit message lines longer than 70 characters; manually wrap lines
remote: New Changes:
remote: removed column parameters from the following methods in both files     def ...
To ssh://
 * [new branch]      HEAD -> refs/publish/master/1597641
edit flag offensive delete link more

Get to know Ask OpenStack

Resources for moderators

Question Tools


Asked: 2016-06-30 05:59:19 -0500

Seen: 595 times

Last updated: Jul 01 '16