armbian/shallow
0
0
Fork 0
mirror of https://github.com/armbian/shallow.git synced 2026-01-06 10:38:03 -08:00
Code Issues Packages Projects Releases Wiki Activity

fetch from torvald's "master" explicitly _and in the correct place_

Browse Source 
- 🤦‍♂️
This commit is contained in:
Ricardo Pardini
2024-08-21 17:21:24 +02:00
parent 335c799b23
commit dbddf2ef8f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
work_kernel_tree.sh
View File

@@ -73,7 +73,7 @@ if ! git config "remote.${GIT_TORVALDS_BUNDLE_REMOTE_NAME}.url"; then
display_alert "Fetching from cold git bundle, wait" "${GIT_TORVALDS_BUNDLE_ID}"
git bundle verify "${GIT_TORVALDS_BUNDLE_FILE}" # Make sure bundle is valid.
git remote add "${GIT_TORVALDS_BUNDLE_REMOTE_NAME}" "${GIT_TORVALDS_BUNDLE_FILE}" # Add the remote pointing to the cold bundle file
git fetch --progress --verbose "${GIT_TORVALDS_BUNDLE_REMOTE_NAME}" master # Fetch it!
git fetch --progress --verbose "${GIT_TORVALDS_BUNDLE_REMOTE_NAME}" # Fetch it!
else
display_alert "Torvalds bundle already fetched..."
fi
@@ -95,7 +95,7 @@ fi
# Fetch from it (to update), also bring in the tags. Around a 60mb download, quite fast.
if [[ "${ONLINE}" == "yes" ]]; then
display_alert "Fetching from torvalds live" "${GIT_TORVALDS_LIVE_REMOTE_NAME}"
git fetch --progress --verbose --tags "${GIT_TORVALDS_LIVE_REMOTE_NAME}" # Fetch it! (including tags!)
git fetch --progress --verbose --tags "${GIT_TORVALDS_LIVE_REMOTE_NAME}" master # Fetch it! (including tags!)
# create a local branch from the fetched
display_alert "Creating local branch 'torvalds-master' from torvalds live" "${GIT_TORVALDS_LIVE_REMOTE_NAME}"
git branch --force "torvalds-master" FETCH_HEAD