8000 Makefile: fix branch name check, wrap modified files · python/python-docs-it@2eed11f · GitHub
[go: up one dir, main page]
Skip to content

Commit 2eed11f

Browse files
m-aciekm-aciek
committed
Makefile: fix branch name check, wrap modified files
1 parent 18c55bd commit 2eed11f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ progress:
5757

5858
.PHONY: merge
5959
merge: upgrade_venv
60-
ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
60+
ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git branch --show-current)" "$(BRANCH)"
6161
$(error "You're merging from a different branch:" "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" vs "$(BRANCH)")
6262
endif
6363
(cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)
@@ -77,6 +77,7 @@ endif
7777
msgcat -o "$$PO" "$$POT";\
7878
fi\
7979
done
80+
powrap -m
8081

8182

8283
.PHONY: fuzzy

0 commit comments

Comments
 (0)
0