20:46 <RolfNoot> Hi all, nice to meet. I am working in the field of electronics since many years, working mainly on microcontroller solution, especially PSoC. Working with OpenOCD quite some years now and I am looking to contribute to OpenOCD

20:46 <PaulFertser> RolfNoot: hi, awesome

20:46 <PaulFertser> RolfNoot: there're instructions in HACKING and if anything's unclear feel free to ask.

20:46 <RolfNoot> Thank you

20:47 <PaulFertser> Sometimes patches take much time to review but feel free to nag the maintainers here every now and then when appropriate.

20:47 <PaulFertser> Also feel free to ping / query me if you have any issues related to project infra.

20:52 <RolfNoot> Thanks! had some issues before but with help of Antonio I got up and running pretty much. If there are any questions, I'll raise my hand ;-)

20:53 <PaulFertser> Sorry I was afraid freenode would just ban me from the channel for mentioning libera, they used to do that.

20:59 <RolfNoot> No problem, I just found out with a quick search

21:01 <RolfNoot> I already started unfortunately with a wrong commit order. I have patch 7984 which should come before 7983. I tried to change with 'git rebase -i ...' but it didn't work for me yet

21:02 <PaulFertser> RolfNoot: basically, git rebase -i HEAD^^ and then in the editor just swap the two lines around.

21:02 <PaulFertser> What exactly didn't work, why?

21:02 <PaulFertser> Probably you needed to fix some conflict?

21:03 <RolfNoot> I did 'git rebase -i origin/master' then swapped the first two commits in the editor

21:04 <RolfNoot> However when I look at the webinterface I still see the same order. I am sorry, not really experienced with git

21:04 <PaulFertser> RolfNoot: did you push to gerrit again after doing the rebase?

21:05 <PaulFertser> RolfNoot: if you saw the right order in "git log" locally and then pushed, it should be good.

21:05 <RolfNoot> I did a push but I will check with git log

21:07 <PaulFertser> RolfNoot: currently on Gerrit 7983 has 7984 as its parent so that's probably OK. However the commit messages are identical, that's very confusing.

21:07 <RolfNoot> Yes, that's correct, it confused me as well. I will change that

21:07 <PaulFertser> rebase -i to the rescue again

21:07 <RolfNoot> In the git log it looks okay as well.

21:08 <PaulFertser> Currently the order is right, 7984, then 7983 on Gerrit, no problem with that.

21:09 <RolfNoot> My intention was to push the includes in contrib>flash>loaders first so I wouldn't break anything. Somehow that went wrong initially.

21:10 <PaulFertser> Usually the loader is pushed along with the flash driver that needs it.

21:25 <RolfNoot> will remind for next time. Along with commit 7984 I also added a board configuration (tcl/board/otx18.cfg) which has some style problems. Now I resolved this issue. Do I need to commit the update with the same Change-Id as it was initially committed with?

21:25 <PaulFertser> RolfNoot: yes, you need to keep the Change-Id so that Gerrit knows it's a newer version of the same change.

21:25 <PaulFertser> So that the history and discussion and everything is kept.

21:28 <RolfNoot> okay thank you

21:35 <RolfNoot> Just to make sure before committing & pushing, I adressed the issue with the style in otx18.cfg and it needs to be committed with:

21:36 <RolfNoot> git commit --signoff -m "fixed style" -m "Change-Id: If18fc77d68bbc82f2abf2a2aa0c557e1d48d788c"

21:37 <RolfNoot> (patch 7984)

21:38 <RolfNoot> sorry, that should be: git commit --signoff -m "fixed style" -m "Change-Id: I7075e44629a7b3c0e1c51638f30b513afe97a82c"

21:40 <borneoa___> RolfNoot: hi, feel free to push again the patches if you need to send an updated version. That is also part of the review process, when modifications are required by the reviewers

21:41 <RolfNoot> okay, then the git commit line above should be good?

21:43 <PaulFertser> RolfNoot: that "fixed style" commit message isn't suitable at all for anything sorry. Please read git log to see how other commits are usually documented.

21:44 <RolfNoot> okay

21:44 <PaulFertser> RolfNoot: usually you just edit the patches with "git commit --amend" and that lets you edit the commit message so you just avoid touching Change-Id there, it's much easier.

21:44 <borneoa___> RolfNoot: writing the commit message on the command line is quite annoying. If you don't put any -m then git should open an editor where you can freely write the whole message. You can also configure git to use your favorite editor

21:45 <borneoa___> RolfNoot: also in git rebase -i you can re-edit the commit message if you need later on

21:45 <RolfNoot> yep, did that config. Will use the editor

21:50 <borneoa___> RolfNoot: git can be a big step at the beginning, but once you own it, you find it's simply great. Take your time, and don't worry if the patches are not exactly what you expect; a new version can be pushed later