search

Murmele / Gittyup

Understand your Git history!
https://murmele.github.io/Gittyup
MIT License
1.37k stars 108 forks source link

Unsupported `merge.conflictstyle` option #752

Open RobWalt opened 2 months ago

RobWalt commented 2 months ago

I'm getting the following error when trying to clone a github repository

Failed to clone into '/tmp/foo/bar.git' - unknown style 'zdiff3' given for 'merge.conflictstyle'

It's ok to me if those options aren't supported but I would expect that cloning would still work without that.

Resources: Here's a good blog post on what that option does https://neg4n.dev/blog/understanding-zealous-diff3-style-git-conflict-markers

Murmele commented 1 month ago

Do you have a public repository to reproduce the problem?

RobWalt commented 1 month ago

Sure here's the complete log output for trying to clone this repo here

[-] 3:32 PM - Clone - https://github.com/Murmele/Gittyup.git
     remote: Enumerating objects: 14566, done.
     remote: Counting objects: 100% (3202/3202), done.
     remote: Compressing objects: 100% (803/803), done.
     remote: Total 14566 (delta 2621), reused 2687 (delta 2361), pack-reused 11364
     Receiving objects: 100% (14566/14566), 78.04 MiB | 0 bytes/s, done.
     Resolving deltas: 100% (10017/10017), done.
     From https://github.com/Murmele/Gittyup.git
      * [new tag]  -> development
      * [new tag]  -> gittyup_v1.0.0
      * [new tag]  -> gittyup_v1.1.0
      * [new tag]  -> gittyup_v1.1.1
      * [new tag]  -> gittyup_v1.1.2
      * [new tag]  -> gittyup_v1.2.0
      * [new tag]  -> gittyup_v1.2.1
      * [new tag]  -> gittyup_v1.2.2
      * [new tag]  -> gittyup_v1.3.0
      * [new tag]  -> latest
      * [new tag]  -> stable
      * [new tag]  -> v2.5.0
      * [new tag]  -> v2.5.1
      * [new tag]  -> v2.5.2
      * [new tag]  -> v2.5.3
      * [new tag]  -> v2.5.4
      * [new tag]  -> v2.5.5
      * [new tag]  -> v2.5.6
      * [new tag]  -> v2.5.7
      * [new tag]  -> v2.5.8
      * [new tag]  -> v2.5.9
      * [new branch] AlternativeTreeView -> origin/AlternativeTreeView
      * [new branch] AmendDateType -> origin/AmendDateType
      * [new branch] Appimage2 -> origin/Appimage2
      * [new branch] ArchBuild -> origin/ArchBuild
      * [new branch] CIWarnings -> origin/CIWarnings
      * [new branch] CacheBlob -> origin/CacheBlob
      * [new branch] Changelog -> origin/Changelog
      * [new branch] CommitMessageTemplate -> origin/CommitMessageTemplate
      * [new branch] DebugDatetime -> origin/DebugDatetime
      * [new branch] Development -> origin/Development
      * [new branch] EditButtonCleanup -> origin/EditButtonCleanup
      * [new branch] EditorHandler -> origin/EditorHandler
      * [new branch] FlatpakNightly -> origin/FlatpakNightly
      * [new branch] Gittyup -> origin/Gittyup
      * [new branch] IgnorePattern -> origin/IgnorePattern
      * [new branch] IgnorePatternSingleCommit -> origin/IgnorePatternSingleCommit
      * [new branch] IndexerCrash -> origin/IndexerCrash
      * [new branch] LibGit2Update -> origin/LibGit2Update
      * [new branch] LineCommit -> origin/LineCommit
      * [new branch] MaximizeDetail -> origin/MaximizeDetail
      * [new branch] OpenSSL1.1.1-stable -> origin/OpenSSL1.1.1-stable
      * [new branch] OwnFiles -> origin/OwnFiles
      * [new branch] Productive -> origin/Productive
      * [new branch] RecurseUntrackedDirs -> origin/RecurseUntrackedDirs
      * [new branch] RefreshPerformanceTest -> origin/RefreshPerformanceTest
      * [new branch] RegexAppdataDate -> origin/RegexAppdataDate
      * [new branch] SmallPatches -> origin/SmallPatches
      * [new branch] SmallerSpacing -> origin/SmallerSpacing
      * [new branch] StageNoRefresh -> origin/StageNoRefresh
      * [new branch] ToolTip -> origin/ToolTip
      * [new branch] TreeViewSearch -> origin/TreeViewSearch
      * [new branch] appimage -> origin/appimage
      * [new branch] appimagerelease -> origin/appimagerelease
      * [new branch] blameFromTo -> origin/blameFromTo
      * [new branch] changelog -> origin/changelog
      * [new branch] checkoutTargetDirectory -> origin/checkoutTargetDirectory
      * [new branch] ci_update_ninja -> origin/ci_update_ninja
      * [new branch] debugBuild -> origin/debugBuild
      * [new branch] debugMessages -> origin/debugMessages
      * [new branch] dotGitError -> origin/dotGitError
      * [new branch] enableTestsWindowsMac -> origin/enableTestsWindowsMac
      * [new branch] features -> origin/features
      * [new branch] fetchHunkAsNeededNew -> origin/fetchHunkAsNeededNew
      * [new branch] fetchHunksAsNeeded -> origin/fetchHunksAsNeeded
      * [new branch] fixCmakeInstallationPaths -> origin/fixCmakeInstallationPaths
      * [new branch] fixFlatpak -> origin/fixFlatpak
      * [new branch] fixPrerelease -> origin/fixPrerelease
      * [new branch] fixRefreshCalls -> origin/fixRefreshCalls
      * [new branch] fixStageAll -> origin/fixStageAll
      * [new branch] fixWindowsInstall -> origin/fixWindowsInstall
      * [new branch] fix_appdata -> origin/fix_appdata
      * [new branch] flatpak -> origin/flatpak
      * [new branch] flatpakCIBuildFix -> origin/flatpakCIBuildFix
      * [new branch] flatpak_artifact -> origin/flatpak_artifact
      * [new branch] flatpak_artifacts -> origin/flatpak_artifacts
      * [new branch] flatpak_sdk_version -> origin/flatpak_sdk_version
      * [new branch] forcePush_Remote -> origin/forcePush_Remote
      * [new branch] gh-pages -> origin/gh-pages
      * [new branch] implementCaseInsensitivForTreeviewSearch -> origin/implementCaseInsensitivForTreeviewSearch
      * [new branch] libgit2update -> origin/libgit2update
      * [new branch] macOSTests -> origin/macOSTests
      * [new branch] macOsX -> origin/macOsX
      * [new branch] mac_theme_switch_listener_test -> origin/mac_theme_switch_listener_test
      * [new branch] macos_build_fix -> origin/macos_build_fix
      * [new branch] master -> origin/master
      * [new branch] master_new -> origin/master_new
      * [new branch] multicolumn -> origin/multicolumn
      * [new branch] open-terminal -> origin/open-terminal
      * [new branch] rebase -> origin/rebase
      * [new branch] release -> origin/release
      * [new branch] released -> origin/released
      * [new branch] restore-filecontextmenu -> origin/restore-filecontextmenu
      * [new branch] setStats -> origin/setStats
      * [new branch] speed -> origin/speed
      * [new branch] splitterPosition -> origin/splitterPosition
      * [new branch] stage -> origin/stage
      * [new branch] translations -> origin/translations
      * [new branch] typo -> origin/typo
      * [new branch] updateAction -> origin/updateAction
      * [new branch] updatePatch -> origin/updatePatch
      * [new branch] version1.0.0 -> origin/version1.0.0
      * [new branch] version_update -> origin/version_update
      * [new branch] windows_line_staging2 -> origin/windows_line_staging2
      * [new branch] work/templateManualApply -> origin/work/templateManualApply
     Failed to clone into '/home/aviac/tmp/Gittyup' - unknown style 'zdiff3' given for 'merge.conflictstyle'

Note that this has nothing to do with the repository but rather with the unsupported git config option which is quiet new, I guess.