Skip to content

Commit b5d28ca

Browse files
committed
refactor: add amend commit to fetch and update commands
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
1 parent 3eea454 commit b5d28ca

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,16 @@ endif
251251
fetch_supermq:
252252
@git subtree add --prefix=$(SUPERMQ_SUBTREE_DIR) $(SUPERMQ_REMOTE_PATH) main --squash
253253
@find $(SUPERMQ_SUBTREE_DIR) -mindepth 1 ! -path 'supermq/docker*' -exec rm -rf {} +
254+
@git add $(SUPERMQ_SUBTREE_DIR)
255+
@git commit --amend --no-edit
254256

255257
update_supermq:
256258
@git subtree pull --prefix=$(SUPERMQ_SUBTREE_DIR) $(SUPERMQ_REMOTE_PATH) main --squash
257259
@find $(SUPERMQ_SUBTREE_DIR) -mindepth 1 ! -path 'supermq/docker*' -exec rm -rf {} +
260+
@git add $(SUPERMQ_SUBTREE_DIR)
261+
@if ! git diff --cached --quiet; then \
262+
git commit --amend --no-edit; \
263+
fi
258264

259265
run: check_certs
260266
docker compose -f docker/docker-compose.yml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)

0 commit comments

Comments
 (0)