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

armbian-next: git: add origin remote if it is empty

Browse Source
This commit is contained in:
Ricardo Pardini 2022-11-25 11:08:56 +01:00
parent 68b86a7d32
commit 64e298f78f
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,11 +100,16 @@ fetch_from_repo() {
local expected_origin_url actual_origin_url
expected_origin_url="$(echo -n "${url}" | sed 's/^.*@//' | sed 's/^.*\/\///')"
local do_add_origin="no"
# Make sure the origin matches what is expected. If it doesn't, clean up and start again.
# Make sure the origin matches what is expected, if the repo already exists.
if [[ -d ".git" && "$(git rev-parse --git-dir)" == ".git" ]]; then
actual_origin_url="$(git config remote.origin.url | sed 's/^.*@//' | sed 's/^.*\/\///')"
if [[ "a${actual_origin_url}a" != "aa" && "${expected_origin_url}" != "${actual_origin_url}" ]]; then
if [[ "a${actual_origin_url}a" == "aa" ]]; then
display_alert "Repo's origin is empty, adding it" "${url}" "warn"
offline=false # Force online, we'll need to fetch.
do_add_origin="yes" # Empty origin, we'll add it.
elif [[ "${expected_origin_url}" != "${actual_origin_url}" ]]; then
display_alert "Remote git URL does not match" "${git_work_dir} expected: '${expected_origin_url}' actual: '${actual_origin_url}'" "warn"
if [[ "${ALLOW_GIT_ORIGIN_CHANGE}" != "yes" ]]; then
exit_with_error "Would have deleted ${git_work_dir} to change origin URL, but ALLOW_GIT_ORIGIN_CHANGE is not set to 'yes'"
@ -117,8 +122,6 @@ fetch_from_repo() {
fi
fi
local do_add_origin="no"
if [[ ! -d ".git" || "$(git rev-parse --git-dir)" != ".git" ]]; then
# Dir is not a git working copy. Make it so;
# If callback is defined, call it. Give it the dir as param. The rest it will read from environment.