From: merlyn@stonehenge.com (Randal L. Schwartz)
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: recent change in git.git/master broke my repos
Date: Thu, 25 Oct 2007 08:55:14 -0700 [thread overview]
Message-ID: <86fxzz6vfh.fsf@blue.stonehenge.com> (raw)
In-Reply-To: <20071025155142.GB19655@coredump.intra.peff.net> (Jeff King's message of "Thu, 25 Oct 2007 11:51:42 -0400")
>>>>> "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!
next prev parent reply other threads:[~2007-10-25 15:55 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 [this message]
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
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=86fxzz6vfh.fsf@blue.stonehenge.com \
--to=merlyn@stonehenge.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.