From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Stash Date: Sun, 05 Apr 2015 13:42:46 -0400 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1428255832 27096 80.91.229.3 (5 Apr 2015 17:43:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 17:43:52 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 19:43:40 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 1YeoaB-0004Cm-Ol for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 19:43:39 +0200 Original-Received: from localhost ([::1]:37168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoaB-0001HU-6d for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 13:43:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoZM-0000Mu-RU for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeoZL-0001iD-Sg for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:48 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoZL-0001i4-J5 for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:47 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YeoZK-00083r-8C; Sun, 05 Apr 2015 13:42:46 -0400 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:184945 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] 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. 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. > 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? 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 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. How unreliable and error-prone Git is. I will recommend that people choose Bzr or CVS. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.