Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix git #9437

Merged
merged 2 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions tools/git/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,48 @@ apk add --update-cache \
ncurses-dev \
tcl \
asciidoc \
xmlto
xmlto \
pcre2-dev
EOF
WORKDIR /tmp/git
ARG name
ARG version
RUN <<EOF
git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/git/git .
EOF
COPY <<EOF config.mak
NO_GETTEXT=YesPlease
NO_SVN_TESTS=YesPlease
NO_REGEX=YesPlease
NO_SYS_POLL_H=1
ICONV_OMITS_BOM=Yes
INSTALL_SYMLINKS=1
USE_LIBPCRE2=YesPlease
NO_PYTHON=YesPlease
NO_TCLTK=YesPlease
EOF
RUN <<EOF
export CFLAGS="${CFLAGS} -static"
make configure
./configure --prefix="${prefix}"
./configure \
--prefix="/usr/local" \
--sysconfdir="/etc"
make -j$(nproc) all
make -j$(nproc) doc
make install install-doc install-html
make install install-doc install-html DESTDIR="${prefix}"
EOF
RUN <<EOF
make -C contrib/subtree
make -C contrib/subtree install DESTDIR="${prefix}"

make -C contrib/diff-highlight
install -Dm755 contrib/diff-highlight/diff-highlight -t "${prefix}/bin/"

install -Dm644 contrib/completion/git-completion.bash "${prefix}/share/bash-completion/completions/git"
install -Dm644 contrib/completion/git-prompt.sh "${prefix}/share/git-core/git-prompt.sh"
EOF
WORKDIR /uniget_bootstrap
RUN <<EOF
cp -r usr/local/* .
rm -rf usr/local
EOF
8 changes: 8 additions & 0 deletions tools/git/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ tags:
homepage: https://git-scm.com/
repository: https://github.com/git/git
description: Distributed version control system
messages:
internals: |
git has multiple paths compiled in:
- GIT_EXEC_PATH defaults to /usr/local/libexec/git-core
- GIT_TEMPLATE_DIR defaults to /usr/local/share/git-core/templates
- Global configuration files are expected to live in /etc/git{attributes,config}

You con override them by setting the approprivate environment variables. Please refer to the official documentation: https://git-scm.com/docs
renovate:
datasource: github-tags
package: git/git
Expand Down
Loading