Skip to content
Snippets Groups Projects
Verified Commit 18529fc1 authored by Patrick Steinhardt's avatar Patrick Steinhardt Committed by GitLab
Browse files

Merge branch 'jt/git-sha1-no-dc' into 'master'

Makefile: Build Git with non-collision-detecting SHA1

See merge request !7575



Merged-by: Patrick Steinhardt's avatarPatrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: default avatarEmily Chui <echui@gitlab.com>
Approved-by: default avatarToon Claes <toon@gitlab.com>
Co-authored-by: default avatarJustin Tobler <jtobler@gitlab.com>
parents d1796429 8e9d4424
No related branches found
No related tags found
1 merge request!7575Makefile: Build Git with non-collision-detecting SHA1
Pipeline #1647688772 failed
Pipeline: praefect-migration-testing

#1647688947

    ......@@ -315,6 +315,12 @@ install: build
    ## Build bundled Git binaries.
    build-bundled-git: build-bundled-git-v2.47 build-bundled-git-v2.48
    build-bundled-git-v2.47: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.47,${GIT_EXECUTABLES})
    # Use non-collision-detecting SHA1 implementation in non-cryptographic scenarios
    # to improve performance. For now, this is only enabled for Git version 2.48 on
    # Linux platforms.
    ifeq ($(OS), Linux)
    build-bundled-git-v2.48: override GIT_BUILD_OPTIONS += OPENSSL_SHA1_UNSAFE=YesPlease
    endif
    build-bundled-git-v2.48: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.48,${GIT_EXECUTABLES})
    .PHONY: install-bundled-git
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment