Hi all,
In MS Windows (XP) I am having a problem updating FG data...
I found adding 'master' after the command did something...
but not sure everything is correct...
I am using git version 1.7.0.2.msysgit.0...
After failing to clone gitorious FG data directly, as the Wiki states,
I cloned the FG data from 'mapserver' - about 3 hours, total 5.4GB
of disk space used - but my initial attempts to then update this from
gitorious fg/fgdata.git bombed... as in :-
$ git pull git://gitorious.org/fg/fgdata.git
You asked to pull from the remote 'git://gitorious.org/fg/fgdata.git', but
did not specify a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
But adding 'master' to the end of the command seemed to do
something ;=(), _BUT_ after about 15 minutes, in
C:\FGCVS\flightgear\data> - this is where I cloned the mapserver
data - got something like :-
call git pull -v git://gitorious.org/fg/fgdata.git master
remote: Counting objects: 804, done.
remote: Compressing objects: 100% (463/463), done.
Receiving objects: 100% (529/529), 13.61 MiB | 12 KiB/s, done.
remote: Total 529 (delta 336), reused 104 (delta 64)
Resolving deltas: 100% (336/336), completed with 162 local objects.
>From git://gitorious.org/fg/fgdata
* branch master -> FETCH_HEAD
There are no candidates for merging among the refs that you just fetched.
Generally this means that you provided a wildcard refspec which had no
matches on the remote end.
So, it does _NOT_ feel like my FG data was UPDATED???
In fact although there are some files dated today in the
special (hidden) .git directory, the oldest real FG data file is
still June 16, but I can see later commits in the online
gitorious tree...
However, if this is all really correct, then maybe someone could
fill in the FGData section of the wiki accordingly, and advise if I
need to continue to add the repository name for each future
update ('pull')...
Or maybe I need to use the --rebase command, or something, to
permanently 'switch' the default repos to gitorious? I notice that
the data file .git/config contains the lines -
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git://mapserver.flightgear.org/fgdata/
Maybe all I need to do is manually amend this to -
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git://gitorious.org/fg/flightgear.git
like it is in the flightgear/source/.git folder?
And maybe other entries in this 'config' file need to be
changed, like I note the mapserver has -
[branch "master"]
remote = origin
merge = refs/heads/master
While the gitorious FG source has -
[branch "next"]
remote = origin
merge = refs/heads/next
Or else advise what I am doing wrong, and how to correct
it (in Windows, but I think it would also apply to *nix)...
As an alternative, can I just continue to use 'mapserver' data?
Is it updated now and then to the latest gitorious fgdata? At
what frequency? I do not 'always' need the very latest, although
I am sure some would... up to a week or so behind would be
fine in most cases...
I also tried to download the master as a tar.gz, to try
to update that way... but over a few hours continually got :-
"The archive is currently being generated, try again later"
Is there a specific time period to avoid this?
But eventually it started to download the 1.63+GB file, but
only _VERY_ slowly, indicating less than 20KB/s, eta 20-30
HOURS, whereas I usually get over 100-200KB/s, so this
also seems out of the question as an 'update' method...
Big help needed ;=((
Regards,
Geoff.
Wiki consulted:
http://wiki.flightgear.org/index.php/FlightGear_Git_on_Windows
PS: A simple 'call git pull' seems to work fine on the simgear and
flightgear sources. Just a problem on FG data...
I tend to 'call' the git commands from a batch file, in a
normal command window, rather than the Git-Bash
windows, but in cases where I have double checked, this
gets the same result as in the Git-Bash command window!
The path 'C:\Program Files\Git\cmd' is in my PATH!
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Flightgear-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
