Enable force pushing via make

[WWW] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 93fb66e265fea26aa8be27b1fb799638ec38ff9e..3ed5755d23cc0ebef5271dec3b01717e3e4f8ad6 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -19,6 +19,8 @@ DESTINATION_PATH = lady/www
 DESTINATION = $(DESTINATION_HOST):$(DESTINATION_PATH)
 DESTINATION_CHARSET = utf-8
 
 DESTINATION = $(DESTINATION_HOST):$(DESTINATION_PATH)
 DESTINATION_CHARSET = utf-8
 

+GIT_FORCE =
+

 build:
 # Put any necessary build scripts in here!
        touch .grass
 build:
 # Put any necessary build scripts in here!
        touch .grass


@@ -34,11 +36,11 @@ ensure-branch-up-to-date:
 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
 
 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
 

-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;