building error / Branch error. git merge. git pull. west update

Question

Everything worked on friday.

but after a git pull and west update on Master branch. but instead of Master branch is an unknown number, or a hash. this happens on everyone but not on nrf directory it stays in Master.

I found out that after west update it create a new branch called manifest-rev. I deleted the new branch but it still reappere when I do west update. I tried to merge it in to master. but nothing is working. I also try to reatach the HEAD since is detached.

USN+103438@S-HVE9127 MINGW64 /c/ncs/zephyr ((d70aa052bc...))
$ git branch
* (HEAD detached at refs/heads/manifest-rev)
manifest-rev
master

I also saw the log

USN+103438@S-HVE9127 MINGW64 /c/ncs/zephyr ((d70aa052bc...))
$ git log
commit d70aa052bc4b333e97a36b4e5832a8509b4aa417 (HEAD, manifest-rev)
Author: Håkon Øye Amundsen <[email protected]>
Date: Fri Apr 5 23:44:01 2019 +0200

cmake: re-apply patch needed for multi image

Without this patch multi image builds will fail
as the modules' build directories are the same
for each image, resulting in an error.

With this patch, each module build dir is placed
within each images build dir, making them unique.

Signed-off-by: Håkon Øye Amundsen <[email protected]>

commit 156cc434efb7e0d94a70887207fecc189e2b0c4f
Merge: 6396ec420f 7eca2568bd
Author: Robert Lubos <[email protected]>
Date: Thu Apr 4 16:03:24 2019 +0200

[nrf mergeup] Merge upstream up to commit 7eca256

but after these changes nothing is working.

I browsed the web for anwers about how to handle gitbash. but I fucking give up.

Martin Lesund · Accepted Answer

Hi Henning, 
 Currently there is a workaround to use SES 
 if you are using SES v4.16 you should be able to use the almost the latest updates from master branch, by rolling back to last week. 
 That means. 
 cd ncs/nrf
git checkout 08b3d50860633bfc56107f7f9b61106c6087e70b
git checkout -b <choose_branch_name>
west update
 
 Then you should be able to run SES

Martin Lesund · Answer

Hi Henning, 
 Please do follow the steps shown in the Documentation referenced in my first post. 
 
 Let's start from a clean slate.

make a folder called "ncs" 
 inside that folder, use the command: ( to clone the manifest repo " nrf" ) 
 west init -m https://github.com/NordicPlayground/fw-nrfconnect-nrf 
 
 Then enter the following command: ( to clone the project repositories) 
 west update 
 
 Then you are done , and the structure should look like this: 
 ncs 
 | ___ . west 
 | ___ mcuboot 
 | ___ nrf 
 | ___ nrfxlib 
 | ___ zephyr

If you want to update the repositories , then you just do a: 
 
 git pull 
 In the " nrf " repo. ( not nrfxlib repo as shown in your screenshot) 
 and follow that up with a: 
 west update 
 To update all the repoes. That's kind of the neat thing with the west tool . 
 So it should look like this:

That the other repoes stays in a HEAD detached state is expected behavior and you do not need to change those.

Best Regards, 
 Martin L.

building error / Branch error. git merge. git pull. west update

Top Replies