From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Feb 2012 07:26:25 +0000 (-0800)
Subject: Merge branch 'mp/make-cleanse-x-for-exe' into maint
X-Git-Tag: v1.7.9.1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb;p=thirdparty%2Fgit.git

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

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

1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb
diff --cc Makefile
index b5530cbaae,6e70a6d44c..4ff3faa472
--- a/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