-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
You could also try:
$ git fetch --all
$ git reset --hard origin/master
or you delete the repo completely and clone it again.
Sorry for the inconvenience - but at least we're
not going to
switch repositories again ;-)
Oooho - are you a oracle? Or are you comming from future? ;)))
By the way - why do we exactly need this "own" httplib2 repo? Can you
explain this to me? Could we solve that in the same manner than
externals in compat (e.g. with a patch)? Who maintains this httplib2
such that it gets merged with updates from its original source??
Greetings
DrTrigon
On 02.09.2013 07:37, Merlijn van Deen wrote:
> Hey Sk!d,
>
> I think this is related to our source switch for httplib2 (from a
> github clone to our own gerrit repo). I can think of two things to
> try; 1) check .git/config to see if externals/httplib2 correctly
> has
https://gerrit.wikimedia.org/r/pywikibot/externals/httplib2.git
> as URL git submodule sync should do that for you (why doesn't
> update --init also do that for you? Silly git)
>
> 2) the less subtle way: remove the submodule entries from
> .git/config, remove the directories under .git/modules and under
> externals/httplib2 and scripts/i18n.
>
Sorry for the inconvenience - but at least we're
not going to
switch repositories again ;-)
>
> Merlijn
>
>
> On 2 September 2013 00:06, swuensch <swuensch(a)gmail.com
> <mailto:swuensch@gmail.com>> wrote:
>
> Hi, I have a problem with git since one week. I get the following
> error message:
>
> [root@server core]# git pullall Already up-to-date. fatal:
> reference is not a tree: e58e6309364dc0a692ee12c1678ab3429cd06cab
> Unable to checkout 'e58e6309364dc0a692ee12c1678ab3429cd06cab' in
> submodule path 'externals/httplib2'
>
> I use core. I am now unable to merge my own branch with the master
> branch. Legoktm tried to help me on irc. If I try "git reset
> --hard" and then "git submodule update --init" i get the same error
> message. " rm -rf externals/httplib2" does not help neither.
>
> I hope someone can help me. You can also contact me on irc. Could
> this be a problem because I did change the directory owner from
> root to a user to push as a user and not as a root from my home pc?
> (I am using the commands as root via ssh.)
>
> Sk!d
>
> _______________________________________________ Pywikipedia-l
> mailing list Pywikipedia-l(a)lists.wikimedia.org
> <mailto:Pywikipedia-l@lists.wikimedia.org>
>
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
>
>
>
>
> _______________________________________________ Pywikipedia-l
> mailing list Pywikipedia-l(a)lists.wikimedia.org
>
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird -
http://www.enigmail.net/
iEYEARECAAYFAlIkeQ0ACgkQAXWvBxzBrDDuwgCg5NII1BXQnK1paB3qvFKjQVVk
gw4AoKalsScd7/3EDbHyXVSN5U+vSmyl
=InN/
-----END PGP SIGNATURE-----