Merge branch 'nd/branch-error-cases' into maint

diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile
index 74b05dc91e42414147d5f3dc7b4fc66fb86c0eca..3d122328c8d1d5e6f53c008aeee0da2c7d2fba80 100644 (file)
--- a/git_remote_helpers/Makefile
+++ b/git_remote_helpers/Makefile
@@ -23,10 +23,16 @@ endif
 
 PYLIBDIR=$(shell $(PYTHON_PATH) -c \
         "import sys; \
-        print 'lib/python%i.%i/site-packages' % sys.version_info[:2]")
+        print('lib/python%i.%i/site-packages' % sys.version_info[:2])")
+
+py_version=$(shell $(PYTHON_PATH) -c \
+       'import sys; print("%i.%i" % sys.version_info[:2])')
 
 all: $(pysetupfile)
-       $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
+       $(QUIET)test "$$(cat GIT-PYTHON-VERSION 2>/dev/null)" = "$(py_version)" || \
+       flags=--force; \
+       $(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build $$flags
+       $(QUIET)echo "$(py_version)" >GIT-PYTHON-VERSION
 
 install: $(pysetupfile)
        $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)
@@ -36,4 +42,4 @@ instlibdir: $(pysetupfile)
 
 clean:
        $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) clean -a
-       $(RM) *.pyo *.pyc
+       $(RM) *.pyo *.pyc GIT-PYTHON-VERSION