On 11/10/2011, at 1:54 PM, Don Quixote de la Mancha wrote:
> On Mon, Oct 10, 2011 at 3:55 PM, Clifford Heath
> <clifford.heath@...> wrote:
>> On 11/10/2011, at 9:11 AM, Don Quixote de la Mancha wrote:
>>> Just now I did a "git pull" in ~/overo-oe/org.openembedded.dev, but it
>>> said I was already up-to-date. That doesn't seem right to me as I
>>> fetched this code from the repository a couple weeks ago.
>>
>> That's correct - the last commit on the upstream repository was Sep 7.
>>
>>> mike@...$ git pull
>>> You are not currently on a branch, so I cannot use any
>>> 'branch.<branchname>.merge' in your configuration file.
>>> Please specify which remote branch you want to use on the command
>>> line and try again (e.g. 'git pull <repository> <refspec>').
>>> See git-pull(1) for details.
>>>
>>> ------>>>>> Do I need to use a specific branch for bit bake?
>>
>> The instructions here say you should use the revision which is tagged "1.12.0":
>> <http://gumstix.org/software-development/open-embedded/61-using-the-open-embedded-build-system.html>
>> This revision is on the master branch, but is 22 revisions behind the head revision
>> on that branch.
>
> Doing a "git pull" after "git checkout 1.12.0" gets a complaint about
> not being on a branch. Is that a problem?
No. The master branch is a consecutive series of commits, and "head"
refers to the most recent one (that you have a copy of). "1.12.0" is an
old commit, not the head of any branch. You can't pull until you check
out head. You *can* however do a "git fetch" to fetch any new revisions
without merging them.
The last documented stable version is 1.12.0, so you don't need to pull
and it wouldn't change anything anyhow.
If you're curious, and want to see what's new in the upstream repository,
you need to "git checkout head" before "git pull". That will fetch any new
commits (same as "git fetch"), merge them (same as "git merge"), which
also sets your "head" to the newest commit. This new head revision may
not work. You can use "git checkout 1.12.0" to get back.
Clifford Heath.
|