Makefile: fix branch name check, wrap modified files

m-aciek · m-aciek · commit 2eed11f5fa98 · 2022-11-18T00:38:01.000+01:00
diff --git a/Makefile b/Makefile
@@ -57,7 +57,7 @@ progress:
 
 .PHONY: merge
 merge: upgrade_venv
-ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
+ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git branch --show-current)" "$(BRANCH)"
 	$(error "You're merging from a different branch:" "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" vs "$(BRANCH)")
 endif
 	(cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)
@@ -77,6 +77,7 @@ endif
 	            msgcat -o "$$PO" "$$POT";\
 	        fi\
 	    done
+	powrap -m
 
 
 .PHONY: fuzzy
