Re: [BUG] Pulling tags no longer works in 1.5.3.4...

From: Jeff King <peff@peff.net>
Date: Dec 4, 2007, 02:33 UTC
Message-ID: <20071204023340.GA22320@coredump.intra.peff.net>
In-Reply-To: <4754B4AF.8070408@garzik.org>

On Mon, Dec 03, 2007 at 09:00:15PM -0500, Jeff Garzik wrote:

Show 12 quoted lines

> 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.

Hrm, when I try to reproduce using v1.5.3.3, I get the "Warning: No merge candidate found..." message. Between 1.5.3.3 and 1.5.3.4, this message got a bit longer and the exit code was fixed to indicate an error. Were you perhaps just missing the warning message, since no error was signaled?

At any rate, I think what you really want in step 3 is

  git fetch --tags ../linux-2.6

since you just want to grab the tags, and not merge anything (remember that pull is fetch+merge -- you are only interesting in the fetching side effect). You could also do this:

  git pull --tags ../linux-2.6 master

In general, "git pull --tags" without a branch to pull doesn't make much sense. What happens is that the "--tags" tells the fetch part of the pull operation to just grab the tags. Then the merge part of the pull operation looks in what has just been fetched for something merge-able. And of course there isn't anything, since all you fetched were tags.

-Peff