From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Thu, 25 Oct 2007 15:55:14 GMT
Subject: Re: recent change in git.git/master broke my repos
Message-ID: <86fxzz6vfh.fsf@blue.stonehenge.com>
In-Reply-To: <20071025155142.GB19655@coredump.intra.peff.net>

>>>>> "Jeff" == Jeff King <peff@peff.net> writes:

Jeff> Why is git-fetch touching your upstream branch at all? Do you have
Jeff> something in your .git/config instructing it to do so? Or do you mean
Jeff> that the 'git-merge upstream' command is failing? Can you 'git-show
Jeff> upstream'? If not, can you 'git-show origin/master'?

It's probably due to this:

[remote "origin"]
        url = [obscured]
        fetch = +refs/heads/*:refs/remotes/origin/*

fetch wants to sync my heads with the origin heads.  But yes, it's
definitely the fetch that fails under today's version, and not
under yesterday's version.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!