mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-01-01 14:44:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Connect git commands to the original stderr

Browse source 
Git commands that perform network fetching can now render progress on
the terminal. This also stops writing any git output to the log file.
This commit is contained in:
Mislav Marohnić 2023-11-07 10:55:01 +01:00
parent 56242478b1
commit 1f72acb6d9
No known key found for this signature in database
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bin/ruby-build
View file

@ -555,7 +555,7 @@ fetch_git() {
local git_url="$2"
local git_ref="$3"
echo "Cloning ${git_url}..." >&2
log_info "Cloning ${git_url}..."
if ! type git &>/dev/null; then
echo "error: please install \`git\` and try again" >&2
@ -566,18 +566,18 @@ fetch_git() {
local cache_dir
cache_dir="$RUBY_BUILD_CACHE_PATH/$(sanitize "$git_url")"
if [ -e "$cache_dir" ]; then
git -C "$cache_dir" fetch --force "$git_url" "+${git_ref}:${git_ref}" >&4 2>&1
log_command git -C "$cache_dir" fetch --force "$git_url" "+${git_ref}:${git_ref}" 2>&3
else
git clone --bare --branch "$git_ref" "$git_url" "$cache_dir" >&4 2>&1
log_command git clone --bare --branch "$git_ref" "$git_url" "$cache_dir" 2>&3
fi
git_url="$cache_dir"
fi
if [ -e "${package_name}" ]; then
git -C "$package_name" fetch --depth 1 origin "+${git_ref}" >&4 2>&1
git -C "$package_name" checkout -q -B "$git_ref" "origin/${git_ref}" >&4 2>&1
if [ -e "$package_name" ]; then
log_command git -C "$package_name" fetch --depth 1 origin "+${git_ref}" 2>&3
log_command git -C "$package_name" checkout -q -B "$git_ref" "origin/${git_ref}" 2>&3
else
git clone --depth 1 --branch "$git_ref" "$git_url" "${package_name}" >&4 2>&1
log_command git clone --depth 1 --branch "$git_ref" "$git_url" "$package_name" 2>&3
fi
}