From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: Stash Date: Sun, 05 Apr 2015 20:31:07 +0200 Organization: Probably a good idea Message-ID: <86sice77h0.fsf@dod.no> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428258683 6657 80.91.229.3 (5 Apr 2015 18:31:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 18:31:23 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 20:31:15 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YepKE-0001j3-2H for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 20:31:14 +0200 Original-Received: from localhost ([::1]:37288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YepKD-0005he-DH for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 14:31:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YepK2-0005gh-8O for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:31:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YepJz-0007Ob-17 for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:31:02 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:43944) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YepJy-0007OO-QK for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:30:58 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YepJx-0001Wr-Nx for emacs-devel@gnu.org; Sun, 05 Apr 2015 20:30:57 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 20:30:57 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 20:30:57 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 69 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:Z+ycMW8gKNep8ZAfiZugI0pO0lA= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184957 Archived-At: >>>>> Richard Stallman : > When people told me that my changes in Lisp files did not get pushed, > I did git pull again, and it told me there was a problem > lisp/ChangeLog again, but there was no conflict in it. > Then I did git commit again. Hm... that may not have been enough? Did you stage lisp/ChangeLog before before doing the commit? Ie. git add lisp/ChangeLog git commit If you didn't and this was marked as a merge, the commit probably didn't happen. > Then I did git push again, and got this. > To rms@git.sv.gnu.org:/srv/git/emacs.git > ! [rejected] master -> master (non-fast-forward) > error: failed to push some refs to 'rms@git.sv.gnu.org:/srv/git/emacs.git' > To prevent you from losing history, non-fast-forward updates were rejected > Merge the remote changes (e.g. 'git pull') before pushing again. See the > 'Note about fast-forwards' section of 'git push --help' for details. > I have no idea what that means. It means someone else pushed since your last pull. Try doing a new pull, followed by a push. git pull git push >> My guess would be that these are still stashed, and need to be >> unstashed and then pushed. > How can I tell? > And if those changes are stashed, why did they show up in git diff? Don't have enough context to say anything here, sorry. > Anyway, I did 'git stash pop' to see if they were stashed. > That seems to have changed dozens of files. > 'git diff origin/master' gave me 5000 lines. > So I tried doing 'git stash' again, and it gave me an error, > fatal: git-write-tree: error building trees > Cannot save the current index state Hm... that's a new one. > I don't have all the output. I had run git in a shell buffer a few > times, and it causes a lot of trouble about the terminal. So I started > running it in an ordinary terminal. > Fortunately it seems that all my changes did make it into Savannah. > So it is just a matter of how to get a clean repository. > Is there any way I can fix this other than creating a new repository? > I should not do that here; it would cost my host too much money, I > fear. If you are sure that all of your changes are on savannah, then git reset --hard HEAD should fix things. Note that if you actually have local changes this is a command that will lose those changes.