Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add check for running in the root of the repository #1438

Merged
merged 2 commits into from
Dec 4, 2023
Merged

Add check for running in the root of the repository #1438

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be75d02
Add check for running in the root of the repository
jdbaldry Dec 4, 2023
a306bbc
Shorten instruction
jdbaldry Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions scripts/apply-patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
function usage {
cat <<EOF
Apply the changes for directory SRC for commit COMMIT to directory DST.
The script assumes it is run from the root of the repository.

Usage:
$0 <COMMIT> <SRC> <DST>
Expand Down Expand Up @@ -50,5 +51,13 @@ function path_components {
echo "${n}"
}

GIT_ROOT="$(git rev-parse --show-toplevel)"
if [[ "$(pwd)" != "${GIT_ROOT}" ]]; then
echo "ERROR: Script has not been run from the repository root ('${GIT_ROOT}')."
echo "Please move to the root directory and re-run the script."

exit 1
fi

git diff "${COMMIT}" -- "${SRC}" > "${PATCH}"
git apply -p "$(path_components "${SRC}")" --directory "${DST}" "${PATCH}"