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

armbian-next: git: setup the worktree first before trying to ensure safe

Browse Source
This commit is contained in:
Ricardo Pardini 2022-12-27 16:38:12 +01:00
parent 5384a7dcbc
commit 143ba996ca
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,6 @@ fetch_from_repo() {
fi
display_alert "Git working dir" "${git_work_dir}" "git"
git_ensure_safe_directory "${git_work_dir}"
# Support using worktrees; needs GIT_BARE_REPO_FOR_WORKTREE set
if [[ "x${GIT_BARE_REPO_FOR_WORKTREE}x" != "xx" ]]; then
@ -123,9 +122,12 @@ fetch_from_repo() {
echo "${git_work_dir}/.git" > "${bare_repo_wt_gitdir}"
display_alert "Modified bare repo gitdir: " "$(cat "${bare_repo_wt_gitdir}")" "git"
git_ensure_safe_directory "${git_work_dir}"
else
mkdir -p "${git_work_dir}" || exit_with_error "No path or no write permission" "${git_work_dir}"
cd "${git_work_dir}" || exit
git_ensure_safe_directory "${git_work_dir}"
if [[ ! -d ".git" || "$(git rev-parse --git-dir)" != ".git" ]]; then
# Dir is not a git working copy. Make it so;
display_alert "Initializing empty git local copy" "git init: $dir $ref_name"