git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Git branching & pulling

From
Wink Saville <wink@saville.com>
Date
May 19, 2007, 05:40 UTC
Message-ID
<d4cf37a60705182240s414243a6wae69d26f70f64dd5@mail.gmail.com>
Hello,
I'm having trouble understanding branching and pull.

Using git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git I can create a branch off the master and do a pull:

wink@ic2d1:~/linux/linux-2.6$ git-checkout master Switched to branch "master" wink@ic2d1:~/linux/linux-2.6$ git-checkout -b test Switched to a new branch "test" wink@ic2d1:~/linux/linux-2.6$ git-pull Already up-to-date.

But from some reason using git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git the following happens

wink@ic2d1:~/linux/kvm-linux-2.6$ git-checkout master
Already on branch "master"
wink@ic2d1:~/linux/kvm-linux-2.6$ git-checkout -b test
Switched to a new branch "test"
wink@ic2d1:~/linux/kvm-linux-2.6$ git-pull
Warning: No merge candidate found because value of config option
         "branch.test.merge" does not match any remote branch fetched.
No changes.

What I notice is that in kvm.git that .git/remotes is empty while on linux-2.6.git .git/remotes has origin and it contains:

URL: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Pull: refs/heads/master:refs/heads/origin

Another difference is that the .git/config file of kvm.git has quite a few items:

[core]
 repositoryformatversion = 0
 filemode = true
 bare = false
 logallrefupdates = true
[remote "origin"]
 url = git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
 fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
 remote = origin
 merge = refs/heads/master
While linux-2.6.git is quite sparse:
[core]
        repositoryformatversion = 0
        filemode = true

Could someone give me some insight or point me at a url or doc that could shed some light on what is happening and why git-pull doesn't work on kvm.git.

Thanks,
Wink Saville
Next: J. Bruce Fields
Message 1 of 12 in “Git branching & pulling”
  1. Wink SavilleMay 19, 2007
  2. J. Bruce FieldsMay 19, 2007
  3. Junio C HamanoMay 19, 2007
  4. Junio C HamanoMay 19, 2007
  5. Steven GrimmMay 19, 2007
  6. Junio C HamanoMay 19, 2007
  7. Wink SavilleMay 19, 2007
  8. Josef WeidendorferMay 20, 2007
  9. Wink SavilleMay 23, 2007
  10. Junio C HamanoMay 23, 2007
  11. Document branch.autosetupmerge.Paolo Bonzini, May 23, 2007
  12. Josef WeidendorferMay 23, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.