Github parts repo problems

vanepp · March 24, 2023, 1:12am

As usual github is getting the better of me. @fai @microMerlin can either of you see what I am missing here? I’m trying to access the files that Kjell committed yesterday. I have a local parts repository which looks like this (on Windows10 from the cygwin command line) set up from the

article on github

git config --list
user.email=************
user.name=Peter Van Epp
safe.directory=/cygdrive/c/Program Files/Fritzing/fritzing-parts
push.default=simple
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
remote.origin.url=GitHub - vanepp/fritzing-parts: Electronic components for use in the Fritzing app (aka the parts library)
remote.origin.fetch=+refs/heads/:refs/remotes/origin/
branch.develop.remote=origin
branch.develop.merge=refs/heads/develop
branch.Dual_VNH5019_motor_driver.remote=origin
branch.Dual_VNH5019_motor_driver.merge=refs/heads/Dual_VNH5019_motor_driver
branch.Dual_VNH2SP30_Motor_Driver_2.remote=origin
branch.Dual_VNH2SP30_Motor_Driver_2.merge=refs/heads/Dual_VNH2SP30_Motor_Driver_2
remote.upstream.url=GitHub - fritzing/fritzing-parts: Electronic components for use in the Fritzing app (aka the parts library)
remote.upstream.fetch=+refs/heads/:refs/remotes/upstream/

owner@owner-PC /cygdrive/d/repos/fritzing-parts
$ git remote -v
origin GitHub - vanepp/fritzing-parts: Electronic components for use in the Fritzing app (aka the parts library) (fetch)
origin GitHub - vanepp/fritzing-parts: Electronic components for use in the Fritzing app (aka the parts library) (push)
upstream GitHub - fritzing/fritzing-parts: Electronic components for use in the Fritzing app (aka the parts library) (fetch)
upstream GitHub - fritzing/fritzing-parts: Electronic components for use in the Fritzing app (aka the parts library) (push)

owner@owner-PC /cygdrive/d/repos/fritzing-parts
$ git fetch upstream

owner@owner-PC /cygdrive/d/repos/fritzing-parts
$ git fetch upstream --tags

owner@owner-PC /cygdrive/d/repos/fritzing-parts

so far so good and it looks synced. But it is in fact not synced at all, and I don’t know why nor how to fix it (which is nothing unusual with github in my case!) The log for this supposedly up to date repo looks like this (last commit back in July last year!)

$ git log
commit c53679d107bbcff09f925fdadfa37b109034b742 (HEAD → develop, origin/develop, origin/HEAD)
Author: afaina anfv@itu.dk
Date: Thu Jul 21 15:07:04 2022 +0200

add unit to the power property in the resistors and do not show it by default

commit e4a0a8978b9ac3765afd4665ce1b8ad810a6e71d
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 13:57:19 2023 +0100

Update setup-python@v2 -> v4

commit 2778dabeac32e308c4d38e949a4016a62f3a0094
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 13:54:57 2023 +0100

Bump go version to 1.19.5

…

The log for a fresh clone of fritzing-parts via

git clone GitHub - fritzing/fritzing-parts: Electronic components for use in the Fritzing app (aka the parts library)

has a log like this which contains the files I am looking for.

$ git log
commit d61d63de9294343b1b6e86f149e78e4b1d3a0009 (HEAD → develop, origin/develop, origin/HEAD)
Author: Kjell Morgenstern kjell@gmx.de
Date: Mon Mar 20 13:37:21 2023 +0100

Remove Infineon_H-BRIDGE_KIT2GO for now, it still has problems. Lets focus on MY_IOT_ADAPTER

commit 229a0f701e75bc41e715ed28829cbb2f6152dcb8
Author: Kjell Morgenstern kjell@gmx.de
Date: Mon Mar 20 13:34:58 2023 +0100

The part wants breadboardbreadboard, but the SVG only has a breadboard layer. Was there a specific reason to use breadboardbreadboard?

commit 6af946a6107100743ba95eecb91e9a8edb8de25b
Author: Kjell Morgenstern kjell@gmx.de
Date: Mon Mar 20 13:33:02 2023 +0100

Undistort text. Looks to me like the distortion was not intended

commit 472dbc58e32699190b0acad364007ba9ccfe434c
Author: Kjell Morgenstern kjell@gmx.de
Date: Mon Mar 20 13:32:15 2023 +0100

Add missing label. Suggesting A, for Sub-assembly or plug-in module. See issue #365

commit 4c5a7a4a4cea961ec07b4dbd9849c0d8dcb2b6d0
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 10:16:38 2023 +0100

Run scour again

commit 9f6b60b2edff76745e8ebe46539859fd7d37f81a
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 10:07:35 2023 +0100

Remove px from fonts

commit b817a4d1a376af75957f57b08b970a04fbf27dd5
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 09:50:06 2023 +0100

Remove empty groups. Remove unusued IDs. Remove unused title elements.

commit 3e438c106b49fccb8bfd7bf5563282cf6a2dde0b
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 09:08:32 2023 +0100

Remove gorn attributes

commit 9b41341fe23ab770067b59a18915576027d2c35a
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 08:48:29 2023 +0100

Update SVG with version from 2022-12-23

commit 9b0c25fb486ea36ec5a6c7e6968f9a3d4b3e23b3
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Mon Nov 28 16:13:11 2022 +0530

Infineon_Mu_IOT_adapter_files updated

commit 330ad5f70fc2dcd062c9b679bf47c9f29e5afe8b
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Mon Nov 28 14:53:30 2022 +0530

Infineon_Mu_IOT_adapter_icon&PCB updated

commit 60bf05b0ff35e1463b1fa715c11eb4075c158dbd
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Mon Nov 28 14:46:19 2022 +0530

Infineon_Mu_IOT_adapter_breadboard updated

commit cb6054d6f5fd679c9cf17abde097f1b7800974c1
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Fri Nov 25 18:42:16 2022 +0530

Infineon_My_IoT_adapter_breadboard updated

commit 3ae785123b22b4155bd60f0e90874b91e86e4d8b
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Wed Nov 23 09:19:19 2022 +0530

Infineon_MY_IOT_ADAPTER files added

commit 0c43ff38f4be70f7a958d5d6647d6671caf03c66
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Tue Oct 11 16:24:03 2022 +0530

layer id added

commit 0c9803a7a5e4bea663d9d100c1b3a542bd6bbea1
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Tue Oct 11 13:02:19 2022 +0530

Infineon_H-BRIDGE_KIT2GO.FZP FILE UPDATED

commit 5c20b71c8bd2a9f5fd08321967e7ac4027e33072
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Tue Oct 11 11:46:45 2022 +0530

updated files

commit 6ccb0b943d45a945c57ae8ceefb6bf546c939908
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Tue Sep 20 15:29:17 2022 +0530

added infineon logo

commit d6a39e417c7295b6b464433810450cb87f43a415
Author: Janarthanan Nagarajan (IFIN DES DOS SOC PCB) Janarthanan.Nagarajan@infineon.com
Date: Mon Sep 19 18:12:42 2022 +0530

Infineon H-BRIDGE-KIT2GO files are added

commit c53679d107bbcff09f925fdadfa37b109034b742
Author: afaina anfv@itu.dk
Date: Thu Jul 21 15:07:04 2022 +0200

add unit to the power property in the resistors and do not show it by default

commit e4a0a8978b9ac3765afd4665ce1b8ad810a6e71d
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 13:57:19 2023 +0100

Update setup-python@v2 -> v4

commit 2778dabeac32e308c4d38e949a4016a62f3a0094
Author: Kjell Morgenstern kjell@gmx.de
Date: Tue Jan 24 13:54:57 2023 +0100

Bump go version to 1.19.5

…

which is not in sync with my repository and I don’t know why. Other than github: situation normal, totally frustrating!

Peter

fai · March 24, 2023, 8:28am

Hi,
Your local files need to be forced to be synchronised with the upstream repository. In git, you decide when to sync. To do that, follow the “synchronizing with fritzing/fritzing-parts” section.

There are basically two commands:
“git checkout develop”: this command will change to the develop branch (of your local repository).

“git merge upstream/develop”: this command will merge the changes from upstream/develop to your local repository (the one in your computer). After you run this command, you will be able to see the new files and commits in your computer.

After this, i would pull the changes to your repository in GitHub: git pull

Maybe you made a fetch before, but fetch commands just get the information of the changes, but do not modify the files or commits of your repository.

vanepp · March 24, 2023, 2:36pm

Thank you! My bad for stopping reading before the end (and missing the update the repo section!) that appears to have worked. Maybe I have this now figured out.

owner@owner-PC /cygdrive/d/repos/fritzing-parts
$ git checkout develop
Already on ‘develop’
Your branch is up to date with ‘origin/develop’.

owner@owner-PC /cygdrive/d/repos/fritzing-parts
$ git merge upstream/develop
Updating c53679d1…d61d63de
Fast-forward
core/Infineon_MY_IOT_ADAPTER.fzp | 1455 ++++++++++++++++++++
…/Infineon_MY_IOT_ADAPTER_breadboard.svg | 507 +++++++
svg/core/icon/Infineon_MY_IOT_ADAPTER_icon.svg | 3 +
svg/core/pcb/Infineon_MY_IOT_ADAPTER_pcb.svg | 172 +++
…/Infineon_MY_IOT_ADAPTER_schematic.svg | 522 +++++++
5 files changed, 2659 insertions(+)
create mode 100644 core/Infineon_MY_IOT_ADAPTER.fzp
create mode 100644 svg/core/breadboard/Infineon_MY_IOT_ADAPTER_breadboard.svg
create mode 100644 svg/core/icon/Infineon_MY_IOT_ADAPTER_icon.svg
create mode 100644 svg/core/pcb/Infineon_MY_IOT_ADAPTER_pcb.svg
create mode 100644 svg/core/schematic/Infineon_MY_IOT_ADAPTER_schematic.svg
owner@owner-PC /cygdrive/d/repos/fritzing-parts
$ git push
Username for ‘https://github.com’:
Password for ‘https://vanepp@github.com’:
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
To GitHub - vanepp/fritzing-parts: Electronic components for use in the Fritzing app (aka the parts library)
c53679d1…d61d63de develop → develop

and finally I seem to be back in sync. Perhaps I can now survivve going forward … Now the git log looks identical to upstream.

Peter

fai · March 24, 2023, 3:35pm

Great. Just remember to create a new branch before changing the files and do not work in the develop branch.

vanepp · March 24, 2023, 4:20pm

That much I know, it was keeping in sync which was driving me nuts. Hopefully that is cured, I guess time will tell .

Peter