Enable force pushing via make

[Blog] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 91854b9291e66685c3e22c606635e4e558afe3ed..3095070b6d0f64ec880db300a74ffb64fc7819dd 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -29,6 +29,8 @@ DESTINATION_HOST = computer
 DESTINATION_PATH = lady/blog
 DESTINATION = $(DESTINATION_HOST):$(DESTINATION_PATH)
 
 DESTINATION_PATH = lady/blog
 DESTINATION = $(DESTINATION_HOST):$(DESTINATION_PATH)
 

+GIT_FORCE =
+

 build:
        deno run --allow-read=. --allow-write=. $(BEORN)
        touch .grass
 build:
        deno run --allow-read=. --allow-write=. $(BEORN)
        touch .grass


@@ -45,11 +47,11 @@ ensure-clean:
        @if output=$$(git status --porcelain) && [ ! -z "$$output" ]; then echo 'Error: There are uncommitted changes!' >&2; echo 'Commit changes and run `make` before syncing.' >&2; exit 1; fi
        @if output=$$(git status --porcelain) && [ ! -z "$$output" ]; then echo 'Error: There are uncommitted changes!' >&2; echo 'Commit changes and run `make` before syncing.' >&2; exit 1; fi
 
        @if output=$$(git status --porcelain) && [ ! -z "$$output" ]; then echo 'Error: There are uncommitted changes!' >&2; echo 'Commit changes and run `make` before syncing.' >&2; exit 1; fi
        @if output=$$(git status --porcelain) && [ ! -z "$$output" ]; then echo 'Error: There are uncommitted changes!' >&2; echo 'Commit changes and run `make` before syncing.' >&2; exit 1; fi
 

-dry-sync: ensure-clean ensure-branch-up-to-date ensure-build
+dry-sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build

        $(RSYNC) $(RSYNC_FLAGS) --del --dry-run --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION)
 
        $(RSYNC) $(RSYNC_FLAGS) --del --dry-run --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION)
 

-sync: ensure-clean ensure-branch-up-to-date ensure-build
+sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build

        $(RSYNC) $(RSYNC_FLAGS) --del --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION)
        $(RSYNC) $(RSYNC_FLAGS) --del --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION)

-       git push --force
+       git push$(if $(GIT_FORCE), --force,)

 
 .PHONY: build dry-sync ensure-branch-up-to-date ensure-build ensure-clean sync;
 
 .PHONY: build dry-sync ensure-branch-up-to-date ensure-build ensure-clean sync;