Skip to content

Commit

Permalink
fetch from torvald's "master" explicitly _and in the correct place_
Browse files Browse the repository at this point in the history
- 🤦‍♂️
  • Loading branch information
rpardini committed Aug 21, 2024
1 parent 335c799 commit dbddf2e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions work_kernel_tree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit dbddf2e

Please sign in to comment.