enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armbian-next: curb down git fetch logging; be verbose if user on terminal & not logging

Browse Source
This commit is contained in:
Ricardo Pardini 2023-01-11 15:22:39 +01:00
parent 2a22cee345
commit 3563a5f1e2
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/functions/general/git.sh
View File

@ -25,8 +25,9 @@ regular_git() {
# avoid repeating myself too much
function improved_git_fetch() {
declare -a verbose_params=() && if_user_on_terminal_and_not_logging_add verbose_params "--verbose" "--progress"
# --no-auto-maintenance requires a recent git version, not available on focal-like host OSs
improved_git fetch --progress --verbose --recurse-submodules=no "$@"
improved_git fetch "${verbose_params[@]}" --recurse-submodules=no "$@"
}
# workaround new limitations imposed by CVE-2022-24765 fix in git, otherwise "fatal: unsafe repository"
@ -133,7 +134,7 @@ fetch_from_repo() {
# Dir is not a git working copy. Make it so;
display_alert "Initializing empty git local copy" "git init: $dir $ref_name"
regular_git init -q . # --initial-branch="armbian_unused_initial_branch" is not supported under focal
offline=false # Force online, we'll need to fetch.
offline=false # Force online, we'll need to fetch.
fi
fi
@ -187,9 +188,20 @@ fetch_from_repo() {
# remote was updated, fetch and check out updates, but not tags; tags pull their respective commits too, making it a huge fetch.
display_alert "Fetching updates from remote repository" "$dir $ref_name"
case $ref_type in
branch | commit) improved_git_fetch --no-tags "${url}" "${ref_name}" ;;
tag) improved_git_fetch --no-tags "${url}" tags/"${ref_name}" ;;
head) improved_git_fetch --no-tags "${url}" HEAD ;;
branch)
improved_git_fetch --no-tags "${url}" "${ref_name}"
;;
commit)
# @TODO: if the local copy has the revision, skip the fetch -- would save us a lot of time
display_alert "Fetching a specific commit/sha1" "${ref_name}" "warn"
improved_git_fetch --no-tags "${url}" "${ref_name}"
;;
tag)
improved_git_fetch --no-tags "${url}" tags/"${ref_name}"
;;
head)
improved_git_fetch --no-tags "${url}" HEAD
;;
esac
checkout_from="FETCH_HEAD"
fi