Using package git-core-1.5.3.3-3.fc7, I can do the following with kernel
git trees:
1) git-clone --reference linux-2.6 linux-2.6 tmp-2.6
2) time passes (days or weeks)
3) cd tmp-2.6
git pull ../linux-2.6
git pull --tags ../linux-2.6
Result: works as expected.
Using package git-core-1.5.3.4-1.fc8, step #3 breaks:
[jgarzik@pretzel misc-2.6]$ git pull --tags ../linux-2.6/
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.
If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:
branch.master.remote = <nickname>
branch.master.merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>
See git-config(1) for details.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
