From 38c21702d91cbc5a85add02374327275afe2f530 Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Fri, 13 Oct 2017 23:07:23 +0200
Subject: [PATCH] make: Don't whine on any commands if ../cpython does not
 exists.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 86e78ad9..8cdf414a 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ todo:
 
 .PHONY: merge
 merge: $(VENV)/bin/sphinx-build
-ifneq "$(shell cd $(CPYTHON_CLONE); git describe --contains --all HEAD)" "$(BRANCH)"
+ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
 	$(error "You're merging from a different branch")
 endif
 	(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)