recent change in git.git/master broke my repos

From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Oct 25, 2007, 14:32 UTC
Message-ID: <86oden6z97.fsf@blue.stonehenge.com>

I have echo "ref: refs/remotes/origin/master" >.git/refs/heads/upstream so that my daily update script can go:

   git-fetch
   if [ repo is on master, and is not dirty ];
      git-merge upstream
   fi

Yesterday that worked.

Today I get a rash of:

  fatal: Couldn't find remote ref refs/remotes/origin/master

from my git-fetch.

Is git-fetch broken, or am I? And if it's me, how do I do what I want instead?

And when are we gonna get "fast forward only" for git-merge?

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