After that you only have to perform a:

git checkout master

And it should be done.

On Thu, May 31, 2012 at 6:45 PM, Spear, Raymond (Mission Critical
Linux) <[email protected]> wrote:
> I am trying to get the current install script to work.  I cannot use the git 
> protocol since my firewall blocks it.
> So I manually did the steps in the install script changing from the git 
> protocol to http.
>
> The pull request fails.
>
> If I do "git pull origin master" the bits get pulled in but none of the tags.
> If I do "git pull http://github.com/autotest/autotest.git master" I seem to 
> get everything including the tags
>
> Here is the out put from the original try:
>
> [root@tcd380-10 install_tools]# cd /usr/local/autotest/
> [root@tcd380-10 autotest]# git init
> Initialized empty Git repository in /usr/local/autotest/.git/
> [root@tcd380-10 autotest]# git remote add origin 
> http://github.com/autotest/autotest.git
> [root@tcd380-10 autotest]# git pull
> remote: Counting objects: 44438, done.
> remote: Compressing objects: 100% (9484/9484), done.
> remote: Total 44438 (delta 34453), reused 38386 (delta 34350)
> Receiving objects: 100% (44438/44438), 74.18 MiB | 1.40 MiB/s, done.
> Resolving deltas: 100% (34453/34453), done.
> From http://github.com/autotest/autotest
>  * [new branch]      master     -> origin/master
>  * [new branch]      next       -> origin/next
> From http://github.com/autotest/autotest
>  * [new tag]         0.13.1     -> 0.13.1
>  * [new tag]         0.14.0     -> 0.14.0
>  * [new tag]         0.14.0-rc1 -> 0.14.0-rc1
>  * [new tag]         0.14.1     -> 0.14.1
> You asked me to pull without telling me which branch you
> want to merge with, and 'branch.master.merge' in
> your configuration file does not tell me, either. Please
> specify which branch you want to use on the command line and
> try again (e.g. 'git pull <repository> <refspec>').
> See git-pull(1) for details.
>
> If you often merge with the same branch, you may want to
> use something like the following in your configuration file:
>
>    [branch "master"]
>    remote = <nickname>
>    merge = <remote-ref>
>
>    [remote "<nickname>"]
>    url = <url>
>    fetch = <refspec>
>
> See git-config(1) for details.



-- 
Lucas
_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to