7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-18 00:29:10 +00:00
Commit Graph

35 Commits

Author SHA1 Message Date
Tomasz Wlostowski
1638322649 KIGIT: fix crash when the repo has no remote set 2025-03-25 16:06:52 +01:00
Seth Hillbrand
cf93cdf13f Respect user preference for rebase/merge 2025-03-24 15:40:25 -07:00
Seth Hillbrand
ea36110980 Trying again to fix Mac build 2025-03-21 17:07:28 -07:00
Seth Hillbrand
b65ceb60b2 Fix builds for newer libgit2 (1.8.0 and newer) 2025-03-21 17:03:28 -07:00
Seth Hillbrand
faf6243d1a Fix build on Windows 2025-03-21 14:42:52 -07:00
Seth Hillbrand
b8225ba2d6 Fix some regressions in git handling
Set default to rebase for pull
Update error string on auth failure
Improve trace logging
2025-03-21 11:55:44 -07:00
Seth Hillbrand
676dd4ceec Fix inheritance for git_common
Avoids repo type pointer issues when casting from void
2025-03-15 13:05:45 -07:00
aris-kimi
bb62444fe9 Fix a git2 related crash when closing KiCad
Fixes: https://gitlab.com/kicad/code/kicad/-/issues/20202
2025-03-14 20:00:17 -07:00
Seth Hillbrand
2c52f98da4 Add ability for git to negotiate with agents
Updates the git connection dialog to reflect default agentic behavior,
followed by default keys and only then reverting to a custom selection
if the user desires

Fixes https://gitlab.com/kicad/code/kicad/-/issues/20204
2025-03-14 17:01:03 -07:00
Seth Hillbrand
26c331a837 Adjust git handling
- Utilize scoped deletion for individual git_*_free() calls
- Protect against multiple usage when updating icons
- Reduce frequency of git update calls
2025-03-14 17:01:03 -07:00
Seth Hillbrand
18ac99d838 Prevent fetch without repo
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20152
2025-02-28 08:34:24 -08:00
Seth Hillbrand
2c54ab277b Thread git checks
Push the git checks from the main thread into child threads to prevent
resource contention in some cases where Windows machines might have many
files in git that are _also_ being managed by Google Drive

Fixes https://gitlab.com/kicad/code/kicad/-/issues/20078
2025-02-25 16:07:19 -08:00
Seth Hillbrand
ba208fd5c9 Suppress git remove if not at head
Don't offer to remove the .git directory if we are not looking at the
base of the git repository for safety

Fixes https://gitlab.com/kicad/code/kicad/-/issues/19889
2025-02-12 14:43:08 -08:00
Seth Hillbrand
7edacd4fb8 Fix git push for some configurations
Reset ssh test keys prior to pushing.  Specify head reference
2025-02-12 13:00:46 -08:00
Jon Evans
04387dd42f Git: safety for calling KIGIT_COMMON with no repo 2025-02-08 16:32:48 -05:00
Jon Evans
d4815534bf Fix lifetime of git_reference in handleFastForward
Fixes https://gitlab.com/kicad/code/kicad/-/issues/19890
2025-02-08 14:40:11 -05:00
Seth Hillbrand
988d229bbf Clean up unused var
Turns out we didn't need that one
2025-01-21 16:21:27 -08:00
Seth Hillbrand
5a57e5cfd4 Handle SSH keys better
OpenSSH will iterate through a series of keys.  Additionally, there may
be a key specified in the ssh/config file that we need to account for.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18864
2025-01-21 15:59:07 -08:00
Seth Hillbrand
427d7d2dad Move git password management to local password control
Don't keep passwords in plain text config files that may be checked into
version control.  Passwords stored in system-specific password managers

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18053
2025-01-20 17:33:55 -08:00
Wayne Stambaugh
5c8f4697ca Common folder housekeeping part 1. 2025-01-12 12:06:45 -05:00
Seth Hillbrand
0b2d4d4879 Revise Copyright statement to align with TLF
Recommendation is to avoid using the year nomenclature as this
information is already encoded in the git repo.  Avoids needing to
repeatly update.

Also updates AUTHORS.txt from current repo with contributor names
2025-01-01 14:12:04 -08:00
Jon Evans
a802ba1199 Make Git push/pull errors visible 2024-10-19 12:34:06 -04:00
Alex Shvartzkop
bc07efc076 Fix a build issue on MSVC with wx 3.3. 2024-06-01 06:48:47 +03:00
Wayne Stambaugh
795a9eea60 Coding policy fixes.
This is primarily to change all instances of wxLogDebug with wxLogTrace
so developers do not have to sift through debugging output that is always
dumped.  The only exception is for code blocks built in debug builds and
called on demand for dumping object states.
2024-05-23 07:59:45 -04:00
Seth Hillbrand
8a306eecb6 Cleanup libgit init calls 2024-05-06 10:18:38 -07:00
Marek Roszko
0ce227fa92 Can't use forward declare with std::vector
Not allowed per C++ standard

See https://github.com/llvm/llvm-project/issues/57700
2024-04-13 08:22:20 -04:00
Ian McInerney
9456f35491 Properly cleanup git repos and memory on project/frame deletion
* Ensure the git backend is deleted when the project tree is deleted.
* Unload the git repo for a project when the project is unloaded from
  the tree.
2024-04-01 21:59:50 +01:00
Ian McInerney
3a90b729ea Hide unused variable warnings in git error strings
These strings aren't actually used right now, but they may be used
in the future, so don't actually remove them but silence the error that
they aren't used.
2023-12-24 01:22:21 +00:00
Jon Evans
3c2922f993 Work around libgit2 API change for supporting older platforms 2023-12-10 23:08:31 -05:00
Seth Hillbrand
1c847889e7 Use deprecated GIT defines
Older Ubuntus/Debians use libgit2 that does not support the new defines.
Newer libgit2 provides a name define translation
2023-10-27 14:59:15 -07:00
Seth Hillbrand
91a151deb1 Coverity fixes 2023-10-21 17:31:58 +02:00
Seth Hillbrand
6e50b4c5f7 Add libgit compatibility header 2023-10-21 00:55:57 +02:00
Jon Evans
e251bbd217 gmtime requires an explicit cast on some platforms 2023-10-20 11:26:22 -04:00
Seth Hillbrand
5c5a38af21 Update fixes for MacOS 2023-10-20 16:21:31 +02:00
Seth Hillbrand
d99641be40 ADDED: Git integration support
Adds support for project-based git integration, branch support, commit,
revert and updates

Fixes https://gitlab.com/kicad/code/kicad/issues/10441
2023-10-20 12:51:47 +00:00