From: Ralf Baechle <ralf@linux-mips.org>
To: Timo Hirvonen <tihirvon@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git pull fails
Date: Tue, 28 Mar 2006 15:11:40 +0100 [thread overview]
Message-ID: <20060328141140.GC3113@linux-mips.org> (raw)
In-Reply-To: <20060328162831.af1bd4c0.tihirvon@gmail.com>
On Tue, Mar 28, 2006 at 04:28:31PM +0300, Timo Hirvonen wrote:
> I think fast-forward check in git-fetch is too strict:
>
> 28 16:13 /usr/src/git: git pull
> Unpacking 33 objects
> 100% (33/33) done
> * refs/heads/todo: same as branch 'todo' of git://git.kernel.org/pub/scm/git/git
> * refs/heads/maint: same as branch 'maint' of git://git.kernel.org/pub/scm/git/git
> * refs/heads/origin: same as branch 'master' of git://git.kernel.org/pub/scm/git/git
> * refs/heads/pu: does not fast forward to branch 'pu' of git://git.kernel.org/pub/scm/git/git;
> not updating.
>
> After removing "exit 1" added by a9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90 from
> git-fetch "git pull" worked again.
Continuing to walk after breaking a leg isn't a good idea, but that's
basically what your change did. What has happened to you is the normal
thing with branches that have been re-based or otherwise re-created.
The better way to handle this kind of branches is to add a `+´ sign to
the refspec for the pu branc in .git/remote/origin like:
[ralf@blah git]$ cat .git/remotes/origin
URL: git://www.kernel.org/pub/scm/git/git.git
Pull: master:master
Pull: todo:todo
Pull: +next:next
Pull: maint:maint
Pull: +pu:pu
Pull: html:html
Pull: man:man
[ralf@blah git]$
The next branch is handled the same way, so another `+´ sign.
Ralf
next prev parent reply other threads:[~2006-03-28 14:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-28 13:28 git pull fails Timo Hirvonen
2006-03-28 14:11 ` Ralf Baechle [this message]
2006-03-28 14:38 ` Timo Hirvonen
2006-03-28 15:00 ` Radoslaw Szkodzinski
2006-03-28 22:48 ` Petr Baudis
2006-03-29 0:11 ` Timo Hirvonen
2006-03-29 0:22 ` Junio C Hamano
2006-03-29 0:24 ` Petr Baudis
2006-03-29 0:40 ` Junio C Hamano
2006-03-29 0:57 ` Petr Baudis
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060328141140.GC3113@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=git@vger.kernel.org \
--cc=tihirvon@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).