[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Stash
From: |
Richard Stallman |
Subject: |
Stash |
Date: |
Sun, 05 Apr 2015 13:42:46 -0400 |
[[[ 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 address@hidden:/srv/git/emacs.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'address@hidden:/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.
- Stash,
Richard Stallman <=
- Re: Stash, Steinar Bang, 2015/04/05
- Re: Stash, Eli Zaretskii, 2015/04/05
- Re: Stash, Richard Stallman, 2015/04/06
- Re: Stash, Steinar Bang, 2015/04/06
- Re: Stash, Eli Zaretskii, 2015/04/06
- Re: Stash, Eli Zaretskii, 2015/04/06
- Re: Stash, Stephen J. Turnbull, 2015/04/07
- Re: Stash, Eli Zaretskii, 2015/04/08
- Re: Stash, Richard Stallman, 2015/04/06