On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> > > 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
Sorry, same error ....
Scratch scratch ... arg why is git sometimes so complicated ;-)
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
------------------------------------------------------------------------
BECCLES
The small bone buttons placed in bacon sandwiches by unemployed
guerrilla dentist.
--- 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: 20110721141834.GE17324@gamma.logic.tuwien.ac.at">h ttp://lists.debian.org/20110721141834.GE17324@gamma.logic.tuwien.ac.at
07-21-2011, 02:18 PM
Norbert Preining
help with git
On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> > > 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
Sorry, same error ....
Scratch scratch ... arg why is git sometimes so complicated ;-)
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
------------------------------------------------------------------------
BECCLES
The small bone buttons placed in bacon sandwiches by unemployed
guerrilla dentist.
--- 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: 20110721141834.GE17324@gamma.logic.tuwien.ac.at">h ttp://lists.debian.org/20110721141834.GE17324@gamma.logic.tuwien.ac.at
07-21-2011, 02:28 PM
Jonas Smedegaard
help with git
On 11-07-21 at 11:18pm, Norbert Preining wrote:
> On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> > > > 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
>
> Sorry, same error ....
>
> Scratch scratch ... arg why is git sometimes so complicated ;-)
...perhaps because you mess with config file options that you are not
familiar with.
Please provide full set of command lines - from an empty workingdir -
that caused that fatal error. Then we haver something reproducible to
work from.
[x] quote me freely [ ] ask before reusing [ ] keep private
07-21-2011, 02:28 PM
Jonas Smedegaard
help with git
On 11-07-21 at 11:18pm, Norbert Preining wrote:
> On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> > > > 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
>
> Sorry, same error ....
>
> Scratch scratch ... arg why is git sometimes so complicated ;-)
...perhaps because you mess with config file options that you are not
familiar with.
Please provide full set of command lines - from an empty workingdir -
that caused that fatal error. Then we haver something reproducible to
work from.
[x] quote me freely [ ] ask before reusing [ ] keep private
07-21-2011, 05:16 PM
Julien Valroff
help with git
Le jeudi 21 juil. 2011 à 15:57:32 (+0200 CEST), Thomas Preud'homme a écrit*:
> 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?
[...]
> > 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.
And fetch the remote objects even before:
% git fetch upstream-git
Check everything ok wit:
% git remote show upstream-git
When running this type of config, how do you avoid pushing the upstream
tags to the debian repository?
On Thu, 21 Jul 2011 at 19:16:50 +0200, Julien Valroff wrote:
> When running this type of config, how do you avoid pushing the upstream
> tags to the debian repository?
To push individual tags, use "git push origin 1.2-3" or something, instead
of "git push --tags".
To get rid of the upstream tags from your local copy, "git tag -d"; to stop
them coming back when you fetch, put in .git/config:
[remote "upstream"]
tagopts = --no-tags
...
(or add the remote with "git remote add --no-tags ..." if you didn't already
add it).
Regards,
S
--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20110721173900.GA26509@reptile.pseudorandom.co.uk" >http://lists.debian.org/20110721173900.GA26509@reptile.pseudorandom.co.uk
07-22-2011, 05:09 AM
Norbert Preining
help with git
Hi,
thanks for your help, Jonas, I think I found the error, or better,
a way to fix that.
On Do, 21 Jul 2011, Jonas Smedegaard wrote:
> ...perhaps because you mess with config file options that you are not
> familiar with.
Well, I used only git for editing the config file, by calling git remote add.
> Please provide full set of command lines - from an empty workingdir -
> that caused that fatal error. Then we haver something reproducible to
> work from.
What really solved the problem was NOT using git branch or so, but
git fetch upstream-git master:upstream-dev
and that worked nicely. It creates a branch that tracks upstream's master
branch and the local is called upstream-dev.
Thanks for your help!
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
------------------------------------------------------------------------
TORONTO (n.) Generic term for anything which comes out of a gush
despite all your careful efforts to let it out gently, e.g. flour into
a white sauce, tomato ketchup on to fried fish, sperm into a human
being, etc.
--- 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: 20110722050925.GF32345@gamma.logic.tuwien.ac.at">h ttp://lists.debian.org/20110722050925.GF32345@gamma.logic.tuwien.ac.at
07-22-2011, 05:20 PM
Julien Valroff
help with git
Le jeudi 21 juil. 2011 à 19:39:00 (+0200 CEST), Simon McVittie a écrit*:
> On Thu, 21 Jul 2011 at 19:16:50 +0200, Julien Valroff wrote:
> > When running this type of config, how do you avoid pushing the upstream
> > tags to the debian repository?
>
> To push individual tags, use "git push origin 1.2-3" or something, instead
> of "git push --tags".
>
> To get rid of the upstream tags from your local copy, "git tag -d"; to stop
> them coming back when you fetch, put in .git/config:
>
> [remote "upstream"]
> tagopts = --no-tags
> ...
>
> (or add the remote with "git remote add --no-tags ..." if you didn't already
> add it).
--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20110722172052.GD20040@kirya.net">http://lists.debian.org/20110722172052.GD20040@kirya.net
help with git
