FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian Development

 
 
LinkBack Thread Tools
 
Old 07-21-2011, 02:10 AM
Norbert Preining
 
Default help with git

Hi everyone,

I have a question regarding git/debian/upstream.

I have a git repository on git.debian.org for packaging upstream,
and I push/pull from that to my local laptop dev.

I use git-import-org and friends, so the layout is:
$ git branch
for-squeeze
master
pristine-tar
upstream
$
where the master is generated from git-import-orig.

I now want to include upstream git into a branch, either the upstream
branch itself, or some other/new one, but I have no idea how
to set that up?

Can someone help me here? The remote is some
git://gitorious.org/<owner>/<proj>.git

By now I have added a remote to my .git/config:
[remote "upstream-git"]
url = git://gitorious.org/mu/mu-ng.git
fetch = +refs/heads/*:refs/remotes/upstream-git/*
tagopt = --tags

Set up with git remote add --tags upstream-git git://gitorious.org/mu/mu-ng.git

But somehow I don't manage to get a branch that follows that remote.
I tried to add:
[branch "upstream-new"]
remote = upstream-git
merge = refs/heads/master
but that tells me:
Your configuration specifies to merge with the ref 'master'
from the remote, but no such ref was fetched.

Sorry, I am a bit at loss here. Any suggestions how to do this properly?

Thanks and all the best

Norbert
------------------------------------------------------------------------
Norbert Preining preining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live & Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
GLOSSOP (n.)
A rouge blob of food. Glossops, which are generally streaming hot and
highly adhesive invariably fall off your spoon and on to the surface
of your host's highly polished antique-rosewood dining table. If this
has not, or may not have, been noticed by the company present, swanage
(q.v.) may be employed.
--- Douglas Adams, The Meaning of Liff


--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20110721021012.GC2153@gamma.logic.tuwien.ac.at">ht tp://lists.debian.org/20110721021012.GC2153@gamma.logic.tuwien.ac.at
 
Old 07-21-2011, 08:11 AM
Jonas Smedegaard
 
Default help with git

On 11-07-21 at 11:10am, Norbert Preining wrote:
> I now want to include upstream git into a branch, either the upstream
> branch itself, or some other/new one, but I have no idea how
> to set that up?
>
> Can someone help me here? The remote is some
> git://gitorious.org/<owner>/<proj>.git
>
> By now I have added a remote to my .git/config:
> [remote "upstream-git"]
> url = git://gitorious.org/mu/mu-ng.git
> fetch = +refs/heads/*:refs/remotes/upstream-git/*
> tagopt = --tags
>
> Set up with git remote add --tags upstream-git git://gitorious.org/mu/mu-ng.git
>
> But somehow I don't manage to get a branch that follows that remote.
> I tried to add:
> [branch "upstream-new"]
> remote = upstream-git
> merge = refs/heads/master
> but that tells me:
> Your configuration specifies to merge with the ref 'master'
> from the remote, but no such ref was fetched.
>
> Sorry, I am a bit at loss here. Any suggestions how to do this
> properly?

I would, instead of editing the config, use this command:

git checkout -B --track upstream-git/foo bar

With foo being the branch as named upstream and bar being what you want
to call it locally.


The core Sugar packages track upstream git as well. You may find some
inspiration in the debian/README.source file of e.g. sugar-base
(ignoring the CDBS parts if you don't use that).


Hope that helps,

- Jonas

--
* Jonas Smedegaard - idealist & Internet-arkitekt
* Tlf.: +45 40843136 Website: http://dr.jones.dk/

[x] quote me freely [ ] ask before reusing [ ] keep private
 
Old 07-21-2011, 01:57 PM
"Thomas Preud'homme"
 
Default help with git

Le jeudi 21 juillet 2011 10:11:37, Jonas Smedegaard a écrit :
> On 11-07-21 at 11:10am, Norbert Preining wrote:
> > I now want to include upstream git into a branch, either the upstream
> > branch itself, or some other/new one, but I have no idea how
> > to set that up?
> >
> > Can someone help me here? The remote is some
> >
> > git://gitorious.org/<owner>/<proj>.git
> >
> > By now I have added a remote to my .git/config:
> > [remote "upstream-git"]
> >
> > url = git://gitorious.org/mu/mu-ng.git
> > fetch = +refs/heads/*:refs/remotes/upstream-git/*
> > tagopt = --tags
> >
> > Set up with git remote add --tags upstream-git
> > git://gitorious.org/mu/mu-ng.git
> >
> > But somehow I don't manage to get a branch that follows that remote.
> > I tried to add:
> > [branch "upstream-new"]
> >
> > remote = upstream-git
> > merge = refs/heads/master
> >
> > but that tells me:
> > Your configuration specifies to merge with the ref 'master'
> > from the remote, but no such ref was fetched.
> >
> > Sorry, I am a bit at loss here. Any suggestions how to do this
> > properly?
>
> I would, instead of editing the config, use this command:
>
> git checkout -B --track upstream-git/foo bar

I would also precede it with git remote add upstream-git <url-of-upstream-git>
to ease the use of upstream repository.
>
> With foo being the branch as named upstream and bar being what you want
> to call it locally.
>
>
> The core Sugar packages track upstream git as well. You may find some
> inspiration in the debian/README.source file of e.g. sugar-base
> (ignoring the CDBS parts if you don't use that).
>
>
> Hope that helps,
>
> - Jonas
 
Old 07-21-2011, 01:57 PM
"Thomas Preud'homme"
 
Default help with git

Le jeudi 21 juillet 2011 10:11:37, Jonas Smedegaard a écrit :
> On 11-07-21 at 11:10am, Norbert Preining wrote:
> > I now want to include upstream git into a branch, either the upstream
> > branch itself, or some other/new one, but I have no idea how
> > to set that up?
> >
> > Can someone help me here? The remote is some
> >
> > git://gitorious.org/<owner>/<proj>.git
> >
> > By now I have added a remote to my .git/config:
> > [remote "upstream-git"]
> >
> > url = git://gitorious.org/mu/mu-ng.git
> > fetch = +refs/heads/*:refs/remotes/upstream-git/*
> > tagopt = --tags
> >
> > Set up with git remote add --tags upstream-git
> > git://gitorious.org/mu/mu-ng.git
> >
> > But somehow I don't manage to get a branch that follows that remote.
> > I tried to add:
> > [branch "upstream-new"]
> >
> > remote = upstream-git
> > merge = refs/heads/master
> >
> > but that tells me:
> > Your configuration specifies to merge with the ref 'master'
> > from the remote, but no such ref was fetched.
> >
> > Sorry, I am a bit at loss here. Any suggestions how to do this
> > properly?
>
> I would, instead of editing the config, use this command:
>
> git checkout -B --track upstream-git/foo bar

I would also precede it with git remote add upstream-git <url-of-upstream-git>
to ease the use of upstream repository.
>
> With foo being the branch as named upstream and bar being what you want
> to call it locally.
>
>
> The core Sugar packages track upstream git as well. You may find some
> inspiration in the debian/README.source file of e.g. sugar-base
> (ignoring the CDBS parts if you don't use that).
>
>
> Hope that helps,
>
> - Jonas
 
Old 07-21-2011, 02:06 PM
Norbert Preining
 
Default help with git

On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> I would, instead of editing the config, use this command:
>
> git checkout -B --track upstream-git/foo bar

That gives me:
fatal: git checkout: updating paths is incompatible with switching branches.

Best wishes

Norbert
------------------------------------------------------------------------
Norbert Preining preining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live & Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
NEMPNETT THRUBWELL (n.)
The feeling experienced when driving off for the frist time on a brand
new motorbike.
--- Douglas Adams, The Meaning of Liff


--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20110721140646.GC17324@gamma.logic.tuwien.ac.at">h ttp://lists.debian.org/20110721140646.GC17324@gamma.logic.tuwien.ac.at
 
Old 07-21-2011, 02:06 PM
Norbert Preining
 
Default help with git

On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> I would, instead of editing the config, use this command:
>
> git checkout -B --track upstream-git/foo bar

That gives me:
fatal: git checkout: updating paths is incompatible with switching branches.

Best wishes

Norbert
------------------------------------------------------------------------
Norbert Preining preining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live & Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
NEMPNETT THRUBWELL (n.)
The feeling experienced when driving off for the frist time on a brand
new motorbike.
--- Douglas Adams, The Meaning of Liff


--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20110721140646.GC17324@gamma.logic.tuwien.ac.at">h ttp://lists.debian.org/20110721140646.GC17324@gamma.logic.tuwien.ac.at
 
Old 07-21-2011, 02:07 PM
Norbert Preining
 
Default help with git

On Do, 21 Jul 2011, Thomas Preud'homme wrote:
> I would also precede it with git remote add upstream-git <url-of-upstream-git>

That I did already.

Thanks both for your suggestions, unfortunately I am not further by now.
Any other ideas?

Best wishes

Norbert
------------------------------------------------------------------------
Norbert Preining preining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live & Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
TWEMLOW GREEN (n.)
The colour of some of Nigel Rees's trousers, worn in the mistaken
belief that they go rather well with his sproston green (q.v.)
jackets.
--- Douglas Adams, The Meaning of Liff


--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20110721140755.GD17324@gamma.logic.tuwien.ac.at">h ttp://lists.debian.org/20110721140755.GD17324@gamma.logic.tuwien.ac.at
 
Old 07-21-2011, 02:07 PM
Norbert Preining
 
Default help with git

On Do, 21 Jul 2011, Thomas Preud'homme wrote:
> I would also precede it with git remote add upstream-git <url-of-upstream-git>

That I did already.

Thanks both for your suggestions, unfortunately I am not further by now.
Any other ideas?

Best wishes

Norbert
------------------------------------------------------------------------
Norbert Preining preining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live & Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
TWEMLOW GREEN (n.)
The colour of some of Nigel Rees's trousers, worn in the mistaken
belief that they go rather well with his sproston green (q.v.)
jackets.
--- Douglas Adams, The Meaning of Liff


--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20110721140755.GD17324@gamma.logic.tuwien.ac.at">h ttp://lists.debian.org/20110721140755.GD17324@gamma.logic.tuwien.ac.at
 
Old 07-21-2011, 02:15 PM
Jonas Smedegaard
 
Default help with git

On 11-07-21 at 11:06pm, Norbert Preining wrote:
> On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> > I would, instead of editing the config, use this command:
> >
> > git checkout -B --track upstream-git/foo bar
>
> That gives me:
> fatal: git checkout: updating paths is incompatible with switching branches.

Sorry, as often happens I got the order wrong:

git checkout -B --track bar upstream-git/foo


- Jonas

--
* Jonas Smedegaard - idealist & Internet-arkitekt
* Tlf.: +45 40843136 Website: http://dr.jones.dk/

[x] quote me freely [ ] ask before reusing [ ] keep private
 
Old 07-21-2011, 02:15 PM
Jonas Smedegaard
 
Default help with git

On 11-07-21 at 11:06pm, Norbert Preining wrote:
> On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> > I would, instead of editing the config, use this command:
> >
> > git checkout -B --track upstream-git/foo bar
>
> That gives me:
> fatal: git checkout: updating paths is incompatible with switching branches.

Sorry, as often happens I got the order wrong:

git checkout -B --track bar upstream-git/foo


- Jonas

--
* Jonas Smedegaard - idealist & Internet-arkitekt
* Tlf.: +45 40843136 Website: http://dr.jones.dk/

[x] quote me freely [ ] ask before reusing [ ] keep private
 

Thread Tools




All times are GMT. The time now is 02:16 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright ©2007 - 2008, www.linux-archive.org