Re: Git branching & pulling
- From
- Josef Weidendorfer <josef.weidendorfer@gmx.de>
- Date
- May 20, 2007, 20:30 UTC
- Message-ID
- <200705202230.24362.Josef.Weidendorfer@gmx.de>
- In-Reply-To
- <d4cf37a60705190931rca1187ap9b98becb6c7c3b2a@mail.gmail.com>
On Saturday 19 May 2007, Wink Saville wrote:
Show 13 quoted lines
> wink@ic2d1:~/testgit-clone$ git-checkout -b test master > Switched to a new branch "test" > wink@ic2d1:~/testgit-clone$ git-pull . > Already up-to-date. > wink@ic2d1:~/testgit-clone$ git-pull . master > Already up-to-date. > wink@ic2d1:~/testgit-clone$ git-pull > Warning: No merge candidate found because value of config option > "branch.test.merge" does not match any remote branch fetched. > No changes. > wink@ic2d1:~/testgit-clone$ > > Why did last git-pull generate the warning, this seems wrong?
Because git does not know what to merge; there is no config entry for "branch.test.merge", as the warning says. How would you reword this warning to make it easier to understand?
But from your question, I assume that you expected git to have a "branch.test.merge" setting. What do you expect it to do? And why?
Is my assumption correct that you want the last command to be equivalent to "git-pull . master"? And my further assumption, that you want this because you expect "git pull" to default to merging changes from its upstream (also when the upstream is local)?
Creation of a branch from another local one never has created "branch.x.remote" or "branch.x.merge" entries. I am not even sure that setting "branch.x.remote" to "." is working in the current version.
BTW: There was some old behavior of "git pull" to always pull the master branch from remote "origin" without any further parameters. I suppose that you did not want this to happen in your example above ?!
Josef