Re: recent change in git.git/master broke my repos

On Thu, Oct 25, 2007 at 07:32:36AM -0700, Randal L. Schwartz wrote:

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.

Works fine here (meaning I can examine 'upstream' as I would any other
branch, and it points to the same place as origin/master).

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

-Peff