From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Feb 2012 06:42:17 +0000 (-0800)
Subject: Merge branch 'mp/make-cleanse-x-for-exe'
X-Git-Tag: v1.7.10-rc0~99
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=297638a98e8a7f200571d7d794dbb5e0a35ca000;p=git.git

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

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

297638a98e8a7f200571d7d794dbb5e0a35ca000
diff --cc Makefile
index 87fb30aed,6e70a6d44..c92c2ba24
--- a/Makefile
+++ b/Makefile
@@@ -458,8 -427,10 +458,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