GNOME Bugzilla – Bug 579596
Wrong advice when failing to rebase git tree
Last modified: 2013-11-21 14:57:16 UTC
$ git commit Makefile.am ChangeLog.README Created commit 93e37cb: Update ChangeLog policy for git 2 files changed, 4 insertions(+), 4 deletions(-) $ git push To ssh://git.gnome.org/git/gnome-bluetooth ! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'ssh://git.gnome.org/git/gnome-bluetooth' $ git pull remote: Counting objects: 7, done. remote: Compressing objects: 100% (4/4), done. remote: Total 4 (delta 3), reused 0 (delta 0) Unpacking objects: 100% (4/4), done. From ssh://git.gnome.org/git/gnome-bluetooth 9617a4b..480113e master -> origin/master Merge made by recursive. po/es.po | 149 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 71 insertions(+), 78 deletions(-) $ git push Counting objects: 10, done. Compressing objects: 100% (6/6), done. Writing objects: 100% (6/6), 734 bytes, done. Total 6 (delta 4), reused 0 (delta 0) --- The commit: To ssh://git.gnome.org/git/gnome-bluetooth ! [remote rejected] master -> master (pre-receive hook declined) commit 7aec8d61ccf54cddf5b393a0f4e1352ec5f35a05 Merge: 93e37cb... 480113e... Author: Bastien Nocera <hadess@hadess.net> Date: Mon Apr 20 11:32:58 2009 +0100 Merge branch 'master' of ssh://git.gnome.org/git/gnome-bluetooth Looks like it was produced by typing 'git pull' without the --rebase option when you had local changes. Running 'git pull --rebase' now will fix the problem. Then please try, 'git push' again. Please see: http://live.gnome.org/Git/Help/ExtraMergeCommits --- error: hooks/pre-receive exited with error code 1 error: failed to push some refs to 'ssh://git.gnome.org/git/gnome-bluetooth' $ git pull --rebase common/bluetooth-chooser.c: needs update refusing to pull with rebase: your working tree is not up-to-date The advice to use "git pull --rebase" fails, because I had some local changes that weren't committed. It should be mentioned in the error message.
Probably could add (You may need to use 'git stash' if you have uncommitted local changes.) To the end.
The GNOME Infrastructure Team is currently migrating its bug / issue tracker away from Bugzilla to Request Tracker and therefore all the currently open bugs have been closed and marked as OBSOLETE. The following move will also act as a cleanup for very old and ancient tickets that were still living on Bugzilla. If your issue still hasn't been fixed as of today please report it again on the relevant RT queue. More details about the available queues you can report the bug against can be found at https://wiki.gnome.org/Sysadmin/RequestTracker. Thanks for your patience, the GNOME Infrastructure Team