git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	"Randal L. Schwartz" <merlyn@stonehenge.com>
Subject: Re: recent change in git.git/master broke my repos
Date: Thu, 25 Oct 2007 12:56:33 -0400	[thread overview]
Message-ID: <20071025165633.GA24143@coredump.intra.peff.net> (raw)
In-Reply-To: <86oden6z97.fsf@blue.stonehenge.com>

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.

Randal and I discussed this a bit on IRC, and it turns out not to be
related to the 'upstream' symref. Instead, he had a broken
branch.master.merge config that pointed to "refs/remotes/origin/master"
(which you can see from his script above doesn't actually get used).

So presumably the old git-fetch didn't care that the contents of
branch.*.master didn't exist (it's just that nothing got marked for
merging), but the one just merged from the db/fetch-pack topic does.

Is this behavior change intentional?

-Peff

  parent reply	other threads:[~2007-10-25 16:56 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-25 14:32 recent change in git.git/master broke my repos Randal L. Schwartz
2007-10-25 15:01 ` Karl Hasselström
2007-10-25 17:46   ` Nicolas Pitre
2007-10-25 18:29     ` Randal L. Schwartz
2007-10-25 20:23     ` Andreas Ericsson
2007-10-25 20:38       ` Nicolas Pitre
2007-10-25 20:42         ` Andreas Ericsson
2007-10-26  7:39     ` Karl Hasselström
2007-10-25 15:51 ` Jeff King
2007-10-25 15:55   ` Randal L. Schwartz
2007-10-25 15:57     ` Jeff King
2007-10-25 15:58       ` Randal L. Schwartz
2007-10-25 16:01         ` Jeff King
2007-10-25 16:06           ` Randal L. Schwartz
2007-10-25 16:56 ` Jeff King [this message]
2007-10-25 18:05   ` Daniel Barkalow
2007-10-27  6:09     ` Junio C Hamano
2007-10-27 20:06       ` Daniel Barkalow

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071025165633.GA24143@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=merlyn@stonehenge.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).