savannah-hackers-public
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Savannah-hackers-public] savane git cannot be committed


From: Karl Berry
Subject: Re: [Savannah-hackers-public] savane git cannot be committed
Date: Mon, 7 Oct 2013 23:34:13 GMT

    git fetch origin && git diff origin

Thanks very much.  Unfortunately, the results are disturbing.

The git fetch origin went without incident, ending with:
..
>From git://127.0.0.1/savane-cleanup
   91a0400..8ce63e8  master     -> origin/master

And I hope the git fetch didn't actually change anything live, because
the git diff origin showed massive diffs.  If I'm reading the a/b right,
apparently all the changes over the last several years would be lost,
including changed mysql passwords, spam handling, and tons more.  Here
is how it starts:

vcs(41)#$ pwd
/usr/src/savane
vcs(42)#$ git diff origin
diff --git a/AUTHORS b/AUTHORS
index 3111409..6cf40cb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,12 +17,9 @@ software.
 See AUTHORS.Savannah for the authors of the Savannah software.
 
 -------------------------------------------------------------------------------
- Nowadays, 2004-2011
+ Nowadays, 2004-2006
 -------------------------------------------------------------------------------
 
-Michael J. Flickinger <mjflick--gnu.org>
-       Bugfixing, code improvements.
-
 Timothee Besset                <ttimo--ttimo.net>
        Subversion support implementation.
 
.. followed by some 14,000 additional lines of diffs ...


Maybe it is based on savane-cleanup (the repository in the project of
that name) instead of savane.git (the repository inside administration)?

At any rate, I guess git pull should not be done under any circumstances
until this is straightened out :).

Thanks,
karl



reply via email to

[Prev in Thread] Current Thread [Next in Thread]