Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Chandler <wchandler@gitlab.com>2023-03-15 23:43:37 +0300
committerWill Chandler <wchandler@gitlab.com>2023-03-15 23:43:37 +0300
commitc0e698ec8590fd68c1f4eeb7ec785381b7d92d72 (patch)
treec9b39d1b0cee70d038a64b21fb569801374b7e74
parent5c42c9509ff0fab716f7b903b9dc4be77f1c15d9 (diff)
Makefile: Treat `PROTO_DEST_DIR` as 'new' in diff
For the `no-proto-changes` Makefile target we diff the newly generated protobufs in `${PROTO_DEST_DIR}` against the in-tree files located in `proto/go`. By placing `${PROTO_DEST_DIR}` as the first argument the diff will show it as the 'old' value, which is unintuitive as it's much more likely to have been changed. Swap the order so new files are treated as new.
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e31ff4ec1..8d1a0629a 100644
--- a/Makefile
+++ b/Makefile
@@ -530,7 +530,7 @@ no-changes:
.PHONY: no-proto-changes
no-proto-changes: PROTO_DEST_DIR := ${BUILD_DIR}/proto-changes
no-proto-changes: proto | ${BUILD_DIR}
- ${Q}${GIT} diff --no-index --exit-code -- "${PROTO_DEST_DIR}" "${SOURCE_DIR}/proto/go"
+ ${Q}${GIT} diff --no-index --exit-code -- "${SOURCE_DIR}/proto/go" "${PROTO_DEST_DIR}"
.PHONY: dump-database-schema
## Dump the clean database schema of Praefect into a file.