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

Fix git_ensure_safe_directory function again

Browse Source 
The command added to check whether the directory is git or not was
having syntax error. Fixed the same. Also it seems adding safe-directory
with local doesn't really work which actually makes sense. hence
reverting to using global instead. Its still safer than before as
we are not adding * and are adding the actual path of the directory
This commit is contained in:
Gunjan Gupta 2024-02-02 00:00:11 +05:30
parent c4963a21d6
commit 218f54dc28
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,9 @@ function improved_git_fetch() {
function git_ensure_safe_directory() {
if [[ -n "$(command -v git)" ]]; then
local git_dir="$1"
if regular_git -C "$1" -C rev-parse --git-dir > /dev/null 2>&1; then
if [[ -e "$1/.git" ]]; then
display_alert "git: Marking all directories as safe, which should include" "$git_dir" "debug"
regular_git -C "$1" config --local --get safe.directory "$1" > /dev/null || regular_git -C "$1" config --local --add safe.directory "$1"
regular_git config --global --get safe.directory "$1" > /dev/null || regular_git config --global --add safe.directory "$1"
fi
else
display_alert "git not installed" "a true wonder how you got this far without git - it will be installed for you" "warn"