All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jérémie NIKAES" <jeremie.nikaes@gmail.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	git@vger.kernel.org, Sylvain Boulme <Sylvain.Boulme@imag.fr>,
	Mike Hommey <mh@glandium.org>
Subject: Re: Git fast-import : Warning duplicated ref: refs/remotes/origin/master
Date: Mon, 30 May 2011 21:55:35 +0200	[thread overview]
Message-ID: <BANLkTi=t-TpbsWP2mhkDnRgMw8p2jJC=nw@mail.gmail.com> (raw)
In-Reply-To: <vpqzkm4gef2.fsf@bauges.imag.fr>

2011/5/30 Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>> Jérémie NIKAES wrote:
>>
>>> No, I actually still have the problem. The version commited on github
>>> is pulling revisions straight to refs/heads/master which is gross
>>> After discussing this matter with our teacher Matthieu Moy, I wanted
>>> to change this to refs/remotes/origin/master but then this warning
>>> gets thrown.
>>
>> The following fixes it for me.
>
> It seems it does, thanks!
>
> clone does not give the warning anymore, and incremental pull work.
>

Yes ! It definitely does ! Works like a charm.

>>  sub mw_capabilities {
>>  #    print STDOUT "fetch\n";
>> +     print STDOUT "refspec refs/heads/*:refs/mediawiki/$remotename/*\n";
>
> Is this "mediawiki" comming from the URL (mediawiki::...), or is it just
> a convention you've set?
>
> We've tried with refspec refs/heads/*:refs/remotes/origin/*, but without
> success.
>
> Do I understand correctly that the "pull" is done in 3 stages:
>
> 1) import into refs/mediawiki/origin
>
> 2) fetch the imported ref into refs/remotes/origin
>
> 3) and merge as usual into the current branch
>
> ?
>
> If so, I don't understand why the distinction between 1) and 2) is
> necessary, and why not to fetch directly into refs/remotes/origin/. IOW,
> in which case is refs/remotes/origin/master different from
> refs/mediawiki/origin/master for example?
>
> Thanks,

We just committed this change to our master branch on github. We
actually have the same questions as Matthieu. We don't really
understand why we have to use another ref to make it work.

Huge thanks to you,

-- 
Jérémie Nikaes

  reply	other threads:[~2011-05-30 19:56 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-29 16:09 Git fast-import : Warning duplicated ref: refs/remotes/origin/master Jérémie NIKAES
2011-05-29 23:24 ` Jonathan Nieder
2011-05-30 14:44   ` Jérémie NIKAES
2011-05-30 14:52     ` Jonathan Nieder
2011-05-30 15:07       ` Jérémie NIKAES
2011-05-30 15:52         ` [PATCH] Documentation: do not misinterpret refspecs as bold text (Re: Git fast-import : Warning duplicated ref: refs/remotes/origin/master) Jonathan Nieder
2011-05-30 16:40           ` remote helpers: best practices for using the "refspec" capability Jonathan Nieder
2011-05-30 17:43             ` Daniel Barkalow
2011-05-30 18:04               ` Sverre Rabbelier
2011-05-30 17:35     ` Git fast-import : Warning duplicated ref: refs/remotes/origin/master Jonathan Nieder
2011-05-30 19:46       ` Matthieu Moy
2011-05-30 19:55         ` Jérémie NIKAES [this message]
2011-05-30 20:13         ` Jonathan Nieder
2011-05-30 20:32           ` Jérémie NIKAES
2011-05-30 23:09             ` Sverre Rabbelier

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='BANLkTi=t-TpbsWP2mhkDnRgMw8p2jJC=nw@mail.gmail.com' \
    --to=jeremie.nikaes@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=Sylvain.Boulme@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=mh@glandium.org \
    /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.