trouble w/ pushing commits -- "failed to push some refs"

On 7/16/11, James Cloos <cloos at jhcloos.com> wrote:
>> To ssh://robert_dodier at maxima.git.sourceforge.net/gitroot/maxima/maxima
>>  ! [rejected]        master -> master (non-fast forward)
>> error: failed to push some refs to
>> 'ssh://robert_dodier at maxima.git.sourceforge.net/gitroot/maxima/maxima'
>
> Whenever you do that, do a 'git pull --rebase' and try again.

OK, tried that. Here's the output from git pull --rebase and git push
afterwards.
I get the same error as before from git push.

This is tangential, but, it seems pretty questionable IMNSHO for Git
to inspect files for "whitespace errors". I can't tell if that's actually
preventing stuff from being brought up to date. Even if it isn't, I just
don't need the noise. I'm having enough trouble figuring out what is
going on.

best,

Robert Dodier

PS. Here's the output.

$ git pull --rebase origin master
robert_dodier at maxima.git.sourceforge.net's password:
robert_dodier at maxima.git.sourceforge.net's password:
remote: Counting objects: 49, done.
remote: Compressing objects: 100% (35/35), done.
remote: Total 35 (delta 25), reused 0 (delta 0)
Unpacking objects: 100% (35/35), done.
First, rewinding head to replay your work on top of it...
HEAD is now at b4cef38... Adding Database.es.texi and removing Contexts.es.texi
Applying Cut out unused special variable TRANSL-MODULES and associated
machinery,
namely the function PRINT-TRANSL-MODULES and macros TRANSL-MODULE
and DEF-TRANSL-MODULE. The properties TTIME-AUTO, FIRST-LOAD,
NO-LOAD-AUTO, PSEUDO, and HYPER, which were defined via DEF-TRANSL-MODULE,
are not referenced anywhere.
Applying Regularize messages and enclose them in GETTEXT calls.
Applying Cut out undocumented flag macsyma_extend_warnp
and act as though it were always true (its default value).
Applying Maxima interface for function dgeqrf (QR decomposition).
Includes a test script and brief Texinfo documentation.
.dotest/patch:47: trailing whitespace.
(%o4) [[                      ],
warning: 1 line adds whitespace errors.
Applying New bernstein polynomial package: code, user documentation,
and regression tests.
.dotest/patch:77: trailing whitespace.
;;  This program is free software; you can redistribute it and/or modify
.dotest/patch:78: trailing whitespace.
;;  it under the terms of the GNU General Public License as published by	
.dotest/patch:79: trailing whitespace.
;;  the Free Software Foundation; either version 2 of the License, or		
.dotest/patch:80: trailing whitespace.
;;  (at your option) any later version.					
.dotest/patch:81: trailing whitespace, space before tab in indent.
 		       								
error: patch failed: doc/info/Makefile.am:53
error: doc/info/Makefile.am: patch does not apply
error: patch failed: doc/info/include-maxima.texi.in:136
error: doc/info/include-maxima.texi.in: patch does not apply
error: share/contrib/bernstein/bernstein.lisp: already exists in index
error: share/contrib/bernstein/bernstein_utilities.mac: already exists in index
error: share/contrib/bernstein/rtest_bernstein.mac: already exists in index
error: patch failed: share/share_testsuite.mac:53
error: share/share_testsuite.mac: patch does not apply
Using index info to reconstruct a base tree...
<stdin>:77: trailing whitespace.
;;  This program is free software; you can redistribute it and/or modify
<stdin>:78: trailing whitespace.
;;  it under the terms of the GNU General Public License as published by	
<stdin>:79: trailing whitespace.
;;  the Free Software Foundation; either version 2 of the License, or		
<stdin>:80: trailing whitespace.
;;  (at your option) any later version.					
<stdin>:81: trailing whitespace, space before tab in indent.
 		       								
warning: squelched 36 whitespace errors
warning: 41 lines add whitespace errors.
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying More updates
.dotest/patch:256: trailing whitespace.
esto es, el orden por defecto es el ascendente, tal como queda definido por
.dotest/patch:264: trailing whitespace.
con @code{orderlessp}. El predicado @code{"<"} permite tambi@'en la
ordenaci@'on
.dotest/patch:265: trailing whitespace.
por norma, pero no ordena completamente los elementos de la lista @var{L} que
.dotest/patch:299: trailing whitespace.
(%i7) sort (my_list, lambda ([a, b],
.dotest/patch:438: trailing whitespace.
de coordenadas actual.
error: patch failed: doc/info/es/Constants.es.texi:1
error: doc/info/es/Constants.es.texi: patch does not apply
error: patch failed: doc/info/es/Differentiation.es.texi:1
error: doc/info/es/Differentiation.es.texi: patch does not apply
error: patch failed: doc/info/es/Lists.es.texi:1
error: doc/info/es/Lists.es.texi: patch does not apply
error: patch failed: doc/info/es/Matrices.es.texi:1
error: doc/info/es/Matrices.es.texi: patch does not apply
Using index info to reconstruct a base tree...
<stdin>:256: trailing whitespace.
esto es, el orden por defecto es el ascendente, tal como queda definido por
<stdin>:264: trailing whitespace.
con @code{orderlessp}. El predicado @code{"<"} permite tambi@'en la
ordenaci@'on
<stdin>:265: trailing whitespace.
por norma, pero no ordena completamente los elementos de la lista @var{L} que
<stdin>:299: trailing whitespace.
(%i7) sort (my_list, lambda ([a, b],
<stdin>:438: trailing whitespace.
de coordenadas actual.
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

$ git push origin master
robert_dodier at maxima.git.sourceforge.net's password:
To ssh://robert_dodier at maxima.git.sourceforge.net/gitroot/maxima/maxima
 ! [rejected]        master -> master (non-fast forward)
error: failed to push some refs to
'ssh://robert_dodier at maxima.git.sourceforge.net/gitroot/maxima/maxima'