Merge branch 'mp/make-cleanse-x-for-exe' into maint

* mp/make-cleanse-x-for-exe:
  Explicitly set X to avoid potential build breakage

diff --cc Makefile
index b5530cbaae9833ad096998b55888851b589fa690,6e70a6d44c7a9e0070f702987e796c71e4325690..4ff3faa4721a269d1649dac6528c1645b46a9681
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -450,8 -427,10 +450,11 @@@ PROGRAM_OBJS += show-index.
  PROGRAM_OBJS += upload-pack.o
  PROGRAM_OBJS += http-backend.o
  PROGRAM_OBJS += sh-i18n--envsubst.o
 +PROGRAM_OBJS += credential-store.o
  
+ # Binary suffix, set to .exe for Windows builds
+ X =
+ 
  PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
  
  TEST_PROGRAMS_NEED_X += test-chmtime