1 parent
ecc201ef50
commit
698e3c4a1b
124 files changed
+4593
-2721
No files matched your search
@@ -34,7 +34,10 @@ tmp_mapped="$(mktemp)"
|
||||
cleanup() { rm -f "$tmp_raw" "$tmp_mapped"; }
|
||||
trap cleanup EXIT
|
||||
|
||||
git diff --binary --find-renames "$PARENT..$SHA" -- backend/ > "$tmp_raw"
|
||||
git diff --binary --find-renames "$PARENT..$SHA" -- \
|
||||
backend/ \
|
||||
':(exclude)backend/migrations/**' \
|
||||
':(exclude)backend/tests/**' > "$tmp_raw"
|
||||
sed \
|
||||
-e 's#^diff --git a/backend/#diff --git a/#' \
|
||||
-e 's# b/backend/# b/#' \
|
||||
@@ -56,4 +59,5 @@ fi
|
||||
|
||||
printf 'Ported backend portion of Oxi commit %s onto branch %s.\n' "$SHA" "$branch"
|
||||
printf 'UPSTREAM_BASE was intentionally NOT changed.\n'
|
||||
printf 'Review excluded upstream DB/tests separately: git show %s -- backend/migrations/ backend/tests/\n' "$SHA"
|
||||
printf 'Review the original commit, especially frontend changes: git show %s -- frontend/\n' "$SHA"
|
||||
Reference in new issue
Block a user