From dbddf2ef8f0d8e85f4dcfe2ab76807d55386f6ec Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 21 Aug 2024 17:21:24 +0200 Subject: [PATCH] fetch from torvald's "master" explicitly _and in the correct place_ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 🤦‍♂️ --- work_kernel_tree.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/work_kernel_tree.sh b/work_kernel_tree.sh index 569bd7c..8cae8f7 100755 --- a/work_kernel_tree.sh +++ b/work_kernel_tree.sh @@ -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