On Fri, Feb 6, 2009 at 4:12 PM, _sc_ wrote:
>
> forgive me if this post is long winded but i find myself
> unable to perform a 'git pull' and i don't know where along
> the line i did the wrong thing
That's a good question. Your steps should work.
> also my steps and mis-steps may provide guideposts for
> others wanting to test the git waters
>
> starting from markus' now famous url
<snip>
> git clone git://repo.or.cz/vim_extended.git
Initialized empty Git repository in /tmp/vim_extended/.git/
remote: Counting objects: 11141, done.
remote: Compressing objects: 100% (2748/2748), done.
remote: Total 11141 (delta 8372), reused 11129 (delta 8360)
Receiving objects: 100% (11141/11141), 12.92 MiB | 1145 KiB/s, done.
Resolving deltas: 100% (8372/8372), done.
> cd vim_extended
$ git config branch.custom.merge
# Here, this returns 1 - pulling into branch custom would give the
error you get.
> git checkout -b custom origin/vim-with-runtime
Branch custom set up to track remote branch
refs/remotes/origin/vim-with-runtime.
Switched to a new branch "custom"
$ git config branch.custom.merge
refs/heads/vim-with-runtime
# And now, you should no longer get that error.
$ git pull
Already up-to-date.
# sure enough...
> git merge origin/feat/rel-line-numbers
<output snipped>
22 files changed, 207 insertions(+), 60 deletions(-)
> git mergetool
No files need merging
> lines 257-275 show how to use rsync to update the runtime into git's
> origin/stuff branch, whatever that is, but again we already have the
> runtime, and I *think* future 'git pull's will retrieve updates to the
> runtime as well as the source
AFAIK, they should - since you based the branch off vim-with-runtime
and not just vim.
> from here it was a matter of first forgetting, then remembering to
> update src/feature.h to remove some code bloat i know i will never
> want -- then a typical make and make install -- all went
> well, vim 7.2.102 was successfully built and installed with
> the relative number patch, and i went to bed happy
Something you did in here must have been relevant, because...
> on day two it was time to test our installation and perform
> our first 'git pull'
>
> #!/bin/bash
> tail ~/.build/vim/vim72/vim_extended/update.log
> dttm | tee -a ~/.build/vim/vim72/vim_extended/update.log
> git pull 2>&1 | tee -a ~/.build/vim/vim72/vim_extended/update.log
> dsh 60 | tee -a ~/.build/vim/vim72/vim_extended/update.log
$ git pull
Already up-to-date.
> this did not go well -- it yielded:
>
> Warning: No merge candidate found because value of config option
> "branch.custom.merge" does not match any remote branch fetched.
$ git config branch.custom.merge
refs/heads/vim-with-runtime
> for me, git branch -a shows:
I see the same...
> 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...
> so now you see how someone new to git might go astray trying
> to follow the README -- or maybe if markus is too busy at
> FOSDEM someone else can help before he gets back...
Strange, though... following the same steps as you, it worked fine for
me. Wonder what the difference was.
~Matt
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
