Problem with wireless-2.6

Problem with wireless-2.6

[Larry Finger]

John,

I did the following set of steps:

git clone --reference ~/linux-2.6 \
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git junk

cd junk
git checkout -b everything origin/everything
git pull
Warning: No merge candidate found because value of config option
         "branch.everything.merge" does not match any remote branch fetched.
No changes.

I know that when I get the above warning, my branch "everything" is never updated. My previous
wireless-2.6 tree was stuck at 2.6.23-rc9, whereas "git describe" lists the new tree at
v2.6.24-rc1-155-g792296c.

What am I doing wrong?

Larry

Re: Problem with wireless-2.6

[Luis R. Rodriguez]

On 11/5/07, Larry Finger <Larry.Finger@lwfinger.net> wrote:
> John,
>
> I did the following set of steps:
>
> git clone --reference ~/linux-2.6 \
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git junk
>
> cd junk
> git checkout -b everything origin/everything
> git pull
> Warning: No merge candidate found because value of config option
>          "branch.everything.merge" does not match any remote branch fetched.
> No changes.
>
> I know that when I get the above warning, my branch "everything" is never updated. My previous
> wireless-2.6 tree was stuck at 2.6.23-rc9, whereas "git describe" lists the new tree at
> v2.6.24-rc1-155-g792296c.
>
> What am I doing wrong?

I am not sure if you can 'pull' from a branch, I think have to pull
from the master and then rebase on the brancehs:

git-checkout master
git-pull
git-checkout junk
git-rebase origin/everything

  Luis

Re: Problem with wireless-2.6

[Andreas Schwab]

Larry Finger <Larry.Finger@lwfinger.net> writes:

> I did the following set of steps:
>
> git clone --reference ~/linux-2.6 \
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.g=
it junk
>
> cd junk
> git checkout -b everything origin/everything
> git pull
> Warning: No merge candidate found because value of config option
>          "branch.everything.merge" does not match any remote branch f=
etched.
> No changes.

What do you get from `git remote show origin'?

Andreas.

--=20
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany
PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4=
ED5
"And now for something completely different."
-
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Problem with wireless-2.6

[Larry Finger]

John W. Linville wrote:
> 
> Well, I'm not sure.  What is the purpose of your 'git pull'? 

To get the latest everything branch.

> What is the head commit on your everything branch?  At present, it should be:
> 
> 	commit 792296c80171081ab1eeb59a206aed651a27fcb0
> 	Merge: 0119130... 286c21f...
> 	Author: John W. Linville <linville@tuxdriver.com>
> 	Date:   Fri Nov 2 17:14:55 2007 -0400
> 
> 	    Merge branch 'ath5k' into everything
> 
> FWIW, 'git describe' on my everything branch also returns
> v2.6.24-rc1-155-g792296c.  What makes you think this is wrong?

That was after I repulled the entire tree. Before it was at 2.6.23-rc9.

>From other comments, I think I needed a git rebase command.

Larry

Re: Problem with wireless-2.6

[Andreas Schwab]

Larry Finger <larry.finger@lwfinger.net> writes:

>>From other comments, I think I needed a git rebase command.

I don't think so.  Do you have set branch.autosetupmerge to false?

Andreas.

--=20
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany
PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4=
ED5
"And now for something completely different."
-
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Problem with wireless-2.6

[Pavel Roskin]

Hello, Larry!

On Mon, 2007-11-05 at 11:49 -0600, Larry Finger wrote:
> John,
> 
> I did the following set of steps:
> 
> git clone --reference ~/linux-2.6 \
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git junk
> 
> cd junk
> git checkout -b everything origin/everything
> git pull
> Warning: No merge candidate found because value of config option
>          "branch.everything.merge" does not match any remote branch fetched.
> No changes.

Just add "--track" to the git-checkout command, and it will be fine:

[proski@dv junk]$ git checkout --track -b everything origin/everything
Branch everything set up to track remote branch refs/remotes/origin/everything.
Switched to a new branch "everything"
[proski@dv junk]$ git-pull
Already up-to-date.
[proski@dv junk]$

Or better yet, add this to ~/.gitconfig:

[branch]
        autosetupmerge = true

This would be equivalent to using "--track" by default.  Please make
sure you have a recent version of git, as --track appeared first in
git-1.5.1.

-- 
Regards,
Pavel Roskin

Re: Problem with wireless-2.6

[Larry Finger]

Pavel Roskin wrote:
> 
> Just add "--track" to the git-checkout command, and it will be fine:
> 
> [proski@dv junk]$ git checkout --track -b everything origin/everything
> Branch everything set up to track remote branch refs/remotes/origin/everything.
> Switched to a new branch "everything"
> [proski@dv junk]$ git-pull
> Already up-to-date.
> [proski@dv junk]$
> 
> Or better yet, add this to ~/.gitconfig:
> 
> [branch]
>         autosetupmerge = true
> 
> This would be equivalent to using "--track" by default.  Please make
> sure you have a recent version of git, as --track appeared first in
> git-1.5.1.
> 

Pavel,

Thanks. I deleted the everything branch and recreated it with --track, and all is good.

Larry