Skip to content

Commit a02abdc

Browse files
committed
Address inconsistencies when using git (packaged with gitaly).
1 parent 8d05283 commit a02abdc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN set -ex && \
4949
libpq5 zlib1g libyaml-0-2 libssl1.1 \
5050
libgdbm6 libreadline8 libncurses5 libffi7 \
5151
libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \
52-
libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential git-core \
52+
libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential \
5353
libmagic1 \
5454
&& update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
5555
&& locale-gen en_US.UTF-8 \

assets/build/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
2424
libpq-dev zlib1g-dev libyaml-dev libssl-dev \
2525
libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
2626
libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
27-
gettext libkrb5-dev"
27+
gettext libkrb5-dev git-core"
2828

2929
## Execute a command as GITLAB_USER
3030
exec_as_git() {

assets/runtime/config/gitlabhq/gitlab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ production: &base
11471147
# CAUTION!
11481148
# Use the default values unless you really know what you are doing
11491149
git:
1150-
bin_path: /usr/bin/git
1150+
bin_path: /usr/local/bin/git
11511151

11521152
## ActionCable settings
11531153
action_cable:

0 commit comments

Comments
 (0)