On Tuesday 10 February 2009 5:54 pm, Markus Heidelberg wrote:
>
> _sc_, 07.02.2009:
> >
> > On Friday 06 February 2009 4:09 pm, Matt Wozniski wrote:
> > >
> > > > and my .git/config contains:
> > >
> > > Somehow, you're missing this:
> > >
> > > [branch "custom"]
> > > remote = origin
> > > merge = refs/heads/vim-with-runtime
> > >
> > > and adding that in should make things work just fine...
> >
> > indeed it does
> >
> > 06 Feb 2009 16:52 Fri
> > Already up-to-date.
> >
> > thank you a lot Matt, that made all the difference
> >
> > markus: i don't know what i did different than matt --
>
> Maybe you have an old git version installed, where the automatic setup
> of .git/config for the remote tracking branches (during the command "git
> checkout -b custom origin/vim-with-runtime") was not yet the default.
my git reports it is version 1.5.2.4 -- is that old? i
don't remember installing it (although that's no guarantee i
didn't) -- i think it came with my suse 10.2 install
i went into yast and asked it to update git, but it still
reports 1.5.2.4
> If this is the case, either set branch.autosetupmerge to true or update
> git, which is of course recommended.
please tell me if i need to take steps to get a newer git
following is my entire .git/config:
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = git://repo.or.cz/vim_extended.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "custom"]
remote = origin
merge = refs/heads/vim-with-runtime
is somewhere in here where i should add something about
branch.autosetupmerge? somewhere else? (this config is on
my ~/.build/vim/vim72/vim_extended/.git path)
and i should again mention, before we go too far in assuming
there's a problem in my setup, i think i may well have
bolixed the setup myself: i don't remember exactly when in
the process it was, but it may well have been during the
checkout of vim-with-runtime, i remember being surprised
with the fact that i wasn't in a totally normal shell -- i
had been using midnight commander and had shelled out of it
with Ctrl-O and was working in that shell -- i suspect it
has differences much as has been discussed in a different
thread concerning shelling out from vim -- i noticed it i
think because something wasn't working like it was supposed
to -- i think my 'inst' script was executing from my ~/bin
path (long irrelevant story)
IOW i cannot guarantee the environment i did the git clone
in is the same one where i did the git checkout or the git
merge -- i know this is careless of me, and i apologize, but
i *think* it's unbolixed now, thanx to matt, at least i get
a nice polite "Already up-to-date." now when i perform a git
pull, vim builds politely, and the relative number patch is
working famously -- in fact i just used it when grabbing the
contents of my .git/config for this email
if you want me to (or if i get snowed in and start running
out of good books to read) i'll whack the entire
vim72/vim_extended path and do the whole thing over from
scratch -- or add something to .git/config, or build a fresh
off the shelf git from sources...
sc
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
