Merge pull request #2554 from sachilles/configure-git-provided-by-gitaly

Address inconsistencies when using git (packaged with gitaly)

Author: sachilles

Dockerfile

@@ -49,7 +49,6 @@ RUN set -ex && \
       libpq5 zlib1g libyaml-0-2 libssl1.1 \
       libgdbm6 libreadline8 libncurses5 libffi7 \
       libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \
-      libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential git-core \
       libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \

assets/build/install.sh

@@ -24,7 +24,8 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
   libpq-dev zlib1g-dev libyaml-dev libssl-dev \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
   libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
-  gettext libkrb5-dev"
+  gettext libkrb5-dev \
+  libexpat1-dev libz-dev libpcre2-dev build-essential git-core"
 
 ## Execute a command as GITLAB_USER
 exec_as_git() {
@@ -150,7 +151,6 @@ chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}
 
 # install git bundled with gitaly.
 make -C ${GITLAB_GITALY_BUILD_DIR} git GIT_PREFIX=/usr/local
-apt remove -y git-core
 
 # clean up
 rm -rf ${GITLAB_GITALY_BUILD_DIR}

assets/runtime/config/gitlabhq/gitlab.yml

@@ -1147,7 +1147,7 @@ production: &base
   # CAUTION!
   # Use the default values unless you really know what you are doing
   git:
-    bin_path: /usr/bin/git
+    bin_path: /usr/local/bin/git
 
   ## ActionCable settings
   action_cable: