Re: Git fast-import : Warning duplicated ref: refs/remotes/origin/master

2011/5/30 Matthieu Moy [off-list ref]:

Jonathan Nieder [off-list ref] writes:

quoted

Jérémie NIKAES wrote:

quoted

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.

quoted

 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