[LyX features/remotes/origin/killqt4] Amend ac248e39, get rid of Qt4 code also in cmake build

[Scott Kostyshak]

On Sat, Nov 19, 2022 at 10:52:25AM -0500, Scott Kostyshak wrote:
> On Sat, Nov 19, 2022 at 04:28:04PM +0100, Kornel Benko wrote:
> > Am Sat, 19 Nov 2022 10:10:54 -0500
> > schrieb Scott Kostyshak <skostysh at lyx.org>:
> > 
> > > On Sat, Nov 19, 2022 at 03:06:10PM +0100, Kornel Benko wrote:
> > > > Am Sat, 19 Nov 2022 13:55:23 +0100 (CET)
> > > > schrieb Kornel Benko <kornel at lyx.org>:
> > > >   
> > > > > The branch, remotes/origin/killqt4, has been created.
> > > > >         at  1a46a146e45984091ef1b3168a7ba7b940a14b09 (commit)
> > > > > 
> > > > > - Log -----------------------------------------------------------------
> > > > > 
> > > > > commit 1a46a146e45984091ef1b3168a7ba7b940a14b09
> > > > > Author: Kornel Benko <kornel at lyx.org>
> > > > > Date:   Sat Nov 19 14:45:03 2022 +0100
> > > > > 
> > > > >     Amend ac248e39, get rid of Qt4 code also in cmake build  
> > > > 
> > > > I seem to be unable to commit to origin/killqt4.  
> > > 
> > > I think it is on the "features" repository: features/killqt4.
> > > 
> > > In case it helps:
> > > 
> > > $ git remote -v
> > > features	git at git.lyx.org:features.git (fetch)
> > > features	git at git.lyx.org:features.git (push)
> > > origin	git at git.lyx.org:lyx (fetch)
> > > origin	git at git.lyx.org:lyx (push)
> > > 
> > > Scott
> > 
> > Yes, but every time i change to
> >  $ git branch origin/killqt4
> > and do f.e.
> >  $ git branch
> > I get:
> > * (HEAD detached from ac248e392d)
> >   betterbreak
> >   breakrows
> >   cleanup/updateMacros4
> >   features/indexmacros
> >   master
> >   origin/killqt4
> >   unit-test-adoption
> > 
> > and then I cannot push anymore.
> > 
> > Also
> >  $ git checkout origin/killqt4
> > leads to
> > warning: refname 'origin/killqt4' is ambiguous.
> > Switched to branch 'origin/killqt4'
> > 
> > And the try to push gets error about not being attached to any branch.
> > 
> > 	Kornel
> 
> What was your "git checkout" command? (search your shell history to recall it).
> 
> I just tried the following:
> 
> $ git fetch --all
> Fetching origin
> Fetching features
> remote: Counting objects: 112, done.
> remote: Compressing objects: 100% (70/70), done.
> remote: Total 70 (delta 63), reused 0 (delta 0)
> Unpacking objects: 100% (70/70), 7.52 KiB | 167.00 KiB/s, done.
> From git.lyx.org:features
>  * [new branch]            killqt4                -> features/killqt4
>  * [new branch]            remotes/origin/killqt4 -> features/remotes/origin/killqt4
> $ git checkout killqt4
> Branch 'killqt4' set up to track remote branch 'killqt4' from 'features'.
> Switched to a new branch 'killqt4'
> $ git push -n
> Everything up-to-date
> $
> 
> I think the key is to do just "git checkout killqt4" (i.e., don't try to
> specify the remote in the path to killqt4). As you can see in the
> output, it automatically sets it up to track from the features
> repository. I don't know why it is origin for you.
> 
> Perhaps another useful command (which takes a few seconds to run) is:
> git remote show features

As far as how to fix your current setup, maybe the following would work (although not sure).

git branch killqt4 --set-upstream-to features/killqt4

And then check with "git push -n".

Scott
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20221119/ef1c1946/attachment.asc>