derek.holloway
7502bf64a4
CodeQL / Analyze (actions) (push) Canceled after 0s
CodeQL / Analyze (python) (push) Canceled after 0s
pre-commit / pre-commit (push) Canceled after 0s
Multi-Arch CI / setup (push) Canceled after 0s
Publish build_manylinux_x86_64 images / publish_build_manylinux_x86_64 (push) Canceled after 0s
Setup (Multi-Arch) / setup (push) Canceled after 0s
Multi-Arch CI / Linux::${{ fromJSON(needs.setup.outputs.linux_build_config || '{}').build_variant_label || 'skip' }} (push) Canceled after 0s
Publish TheRock Docker image / build-and-push-image (push) Canceled after 0s
Publish no_rocm_image_ubi10 image / publish_no_rocm_image_ubi10 (push) Canceled after 0s
Multi-Arch CI / Windows::${{ fromJSON(needs.setup.outputs.windows_build_config || '{}').build_variant_label || 'skip' }} (push) Canceled after 0s
Publish TheRock Docker image / build-and-push-image (push) Canceled after 0s
Multi-Arch CI / Manifest Diff (push) Canceled after 0s
TheRock Manifest Diff Report / Generate Manifest Diff Report (push) Canceled after 0s
Multi-Arch CI / CI Summary (push) Canceled after 0s
Publish no_rocm_image_ubuntu24_04 images / publish_no_rocm_image_ubuntu24_04 (push) Canceled after 0s
Publish no_rocm_image_ubuntu24_04_ocl_rt images / publish_no_rocm_image_ubuntu24_04_ocl_rt (push) Canceled after 0s
Publish TheRock Docker image / build-and-push-image (push) Canceled after 0s
Publish TheRock Docker image / build-and-push-image (push) Canceled after 0s
Publish no_rocm_image_ubuntu24_04 images / publish_no_rocm_image_ubuntu24_04_rocgdb (push) Canceled after 0s
Publish no_rocm_image_ubuntu24_04_rocgdb images / publish_no_rocm_image_ubuntu24_04_rocgdb (push) Canceled after 0s
Publish no_rocm_image_ubuntu24_04 images / publish_no_rocm_image_ubuntu24_04_ocl_rt (push) Canceled after 0s
Publish TheRock Docker image / build-and-push-image (push) Canceled after 0s
Unit Tests / Unit Tests :: ubuntu-24.04 (push) Canceled after 0s
Unit Tests / Unit Tests :: windows-2022 (push) Canceled after 0s
Publish no_rocm_image_ubuntu24_04 images / publish_no_rocm_image_ubuntu24_04_media (push) Canceled after 0s
Unit Tests / Unit Tests Summary (push) Canceled after 0s
Publish no_rocm_image_ubuntu24_04 images / publish_no_rocm_image_ubuntu24_04_openmpi (push) Canceled after 0s
38 lines
1.5 KiB
Bash
Executable File
38 lines
1.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# This script can be installed in .git/config to allow rebasing old patches across
|
|
# libc++'s clang-format of the whole tree. Most contributors should not require that
|
|
# since they don't have many pre-clang-format patches lying around. This script is to
|
|
# make it easier for contributors that do have such patches.
|
|
#
|
|
# The script is installed by running the following from the root of your repository:
|
|
#
|
|
# $ git config merge.libcxx-reformat.name "Run clang-format when rebasing libc++ patches"
|
|
# $ git config merge.libcxx-reformat.driver "libcxx/utils/clang-format-merge-driver.sh %O %A %B %P"
|
|
#
|
|
# This is based on https://github.com/nico/hack/blob/main/notes/auto_git_rebase_across_mechanical_changes.md.
|
|
# Many thanks to Nico Weber for paving the way here.
|
|
|
|
# Path to the file's contents at the ancestor's version.
|
|
base="$1"
|
|
|
|
# Path to the file's contents at the current version.
|
|
current="$2"
|
|
|
|
# Path to the file's contents at the other branch's version (for nonlinear histories, there might be multiple other branches).
|
|
other="$3"
|
|
|
|
# The path of the file in the repository.
|
|
path="$4"
|
|
|
|
clang-format --style=file --assume-filename="$path" < "$base" > "$base.tmp"
|
|
mv "$base.tmp" "$base"
|
|
|
|
clang-format --style=file --assume-filename="$path" < "$current" > "$current.tmp"
|
|
mv "$current.tmp" "$current"
|
|
|
|
clang-format --style=file --assume-filename="$path" < "$other" > "$other.tmp"
|
|
mv "$other.tmp" "$other"
|
|
|
|
git merge-file -Lcurrent -Lbase -Lother "$current" "$base" "$other"
|