threads / discuss / 21542

pulling git -- version confusion

Subject: pulling git -- version confusion

## tl;dr

7 messages between Nov 9, 2009 and Nov 9, 2009.

replies: 6people: 3as markdown or json

Rustom Mody· Nov 9, 2009, 06:14 UTC · lore
I did a git pull today

When I compile it git --version gives git version 1.6.3.3.334.g916e1

Whereas latest stable shown on http://git-scm.com/ is 1.6.5.2.

Note:
git branch shows a star before master
git tag contains v1.6.5.2 as well as v1.6.3.3

When I checkout branch next git version becomes 1.6.0.rc1.194.g9e4e

Can someone explain whats happening or am I missing something basic?
Sverre Rabbelier· Nov 9, 2009, 06:37 UTC · re: Rustom Mody · lore

Re: pulling git -- version confusion

Heya,
On Mon, Nov 9, 2009 at 07:14, Rustom Mody <rustompmody@gmail.com> wrote:
> When I checkout branch next
> git version becomes  1.6.0.rc1.194.g9e4e

Try either: $ git checkout master $ git reset --hard origin/master

or: $ git checkout next $ git reset --hard origin/next

Followed by: $ make $ ./git --version

-- 
Cheers,

Sverre Rabbelier
Rustom Mody· Nov 9, 2009, 07:45 UTC · re: Sverre Rabbelier · lore

Re: pulling git -- version confusion

On Mon, Nov 9, 2009 at 12:07 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
Show 9 quoted lines
> Heya,
>
> On Mon, Nov 9, 2009 at 07:14, Rustom Mody <rustompmody@gmail.com> wrote:
>> When I checkout branch next
>> git version becomes  1.6.0.rc1.194.g9e4e
>
> Try either:
> $ git checkout master
> $ git reset --hard origin/master

Gives me fatal: ambiguous argument 'origin/master': unknown revision or path not in the working tree. Use '--' to separate paths from revisions

>
> or:
> $ git checkout next
> $ git reset --hard origin/next
Likewise here
Show 10 quoted lines
>
> Followed by:
> $ make
> $ ./git --version
>
> --
> Cheers,
>
> Sverre Rabbelier
>
Sverre Rabbelier· Nov 9, 2009, 07:51 UTC · re: Rustom Mody · lore

Re: pulling git -- version confusion

Heya,
On Mon, Nov 9, 2009 at 08:45, Rustom Mody <rustompmody@gmail.com> wrote:
> Gives me
> fatal: ambiguous argument 'origin/master': unknown revision or path
> not in the working tree.
> Use '--' to separate paths from revisions
Well, as what remote do you have upstream configured?

What is the output of $ git config -l

-- 
Cheers,

Sverre Rabbelier
Rustom Mody· Nov 9, 2009, 13:24 UTC · re: Sverre Rabbelier · lore

Re: pulling git -- version confusion

On Mon, Nov 9, 2009 at 1:21 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
Show 10 quoted lines
> On Mon, Nov 9, 2009 at 08:45, Rustom Mody <rustompmody@gmail.com> wrote:
>> Gives me
>> fatal: ambiguous argument 'origin/master': unknown revision or path
>> not in the working tree.
>> Use '--' to separate paths from revisions
>
> Well, as what remote do you have upstream configured?
>
> What is the output of
> $ git config -l
gives me

core.safecrlf=true user.email=<my email> user.name=<my name> core.repositoryformatversion=0 core.filemode=true gui.geometry=885x450+0+27 207 192

So theres no remote? But .git/remotes/origin has

URL: git://git.kernel.org/pub/scm/git/git.git
Pull: refs/heads/master:refs/heads/origin
Pull: refs/heads/maint:refs/heads/maint
Pull: refs/heads/next:refs/heads/next
Pull: refs/heads/html:refs/heads/html
Pull: refs/heads/pu:refs/heads/pu
Pull: refs/heads/todo:refs/heads/todo
Pull: refs/heads/man:refs/heads/man

Also [I just tried this] if I make a fresh repo directly and then do a git pull it gives a fatal: where do you want to fetch from

But with the git repo pull (seems to be) pulling all sorts of stuff and not erroring out.

Sverre Rabbelier· Nov 9, 2009, 19:16 UTC · re: Rustom Mody · lore

Re: pulling git -- version confusion

Heya,
On Mon, Nov 9, 2009 at 14:24, Rustom Mody <rustompmody@gmail.com> wrote:
> So theres no remote?
> But .git/remotes/origin has

Ick, how about switching to: $ git remote add origin"git://git.kernel.org/pub/scm/git/git.git"

And then you can do what I said earlier?
-- 
Cheers,

Sverre Rabbelier
Junio C Hamano· Nov 9, 2009, 21:58 UTC · re: Rustom Mody · lore

Re: pulling git -- version confusion

Rustom Mody <rustompmody@gmail.com> writes:
Show 32 quoted lines
> On Mon, Nov 9, 2009 at 1:21 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
>> On Mon, Nov 9, 2009 at 08:45, Rustom Mody <rustompmody@gmail.com> wrote:
>>> Gives me
>>> fatal: ambiguous argument 'origin/master': unknown revision or path
>>> not in the working tree.
>>> Use '--' to separate paths from revisions
>>
>> Well, as what remote do you have upstream configured?
>>
>> What is the output of
>> $ git config -l
>
> gives me
>
> core.safecrlf=true
> user.email=<my email>
> user.name=<my name>
> core.repositoryformatversion=0
> core.filemode=true
> gui.geometry=885x450+0+27 207 192
>
> So theres no remote?
> But .git/remotes/origin has
>
> URL: git://git.kernel.org/pub/scm/git/git.git
> Pull: refs/heads/master:refs/heads/origin
> Pull: refs/heads/maint:refs/heads/maint
> Pull: refs/heads/next:refs/heads/next
> Pull: refs/heads/html:refs/heads/html
> Pull: refs/heads/pu:refs/heads/pu
> Pull: refs/heads/todo:refs/heads/todo
> Pull: refs/heads/man:refs/heads/man

That's a layout that was default before 1.5.0, I think. 3 years is an eon in git timescale.

People giving advice based on modern git experience would say things like "origin/master", but in your layout that ref that keeps track of where the 'master' branch at the remote repository is is not called 'origin/master', but simply 'origin'.

So instead of
> Try either:
> $ git checkout master
> $ git reset --hard origin/master
that Sverre gave you, in your repository you would do:
    $ git checkout master
    $ git reset --hard origin

← back to recent threads