From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 19:40:02 +0000 (-0700)
Subject: Merge branch 'pw/git-p4'
X-Git-Tag: v1.7.11-rc0~130
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4c9d7bc4a68e0c0608e865ccac69a517bc3f65b7?ds=inline;hp=-c

Merge branch 'pw/git-p4'

By Pete Wyckoff
* pw/git-p4:
git p4: use "git p4" directly in tests
git p4: update name in script
git-p4: move to toplevel
---

4c9d7bc4a68e0c0608e865ccac69a517bc3f65b7
diff --combined Makefile
index abee43e264,df86f2f97a..28a46e5594
--- a/Makefile
+++ b/Makefile
@@@ -440,6 -440,7 +440,7 @@@ SCRIPT_PERL += git-send-email.per
  SCRIPT_PERL += git-svn.perl
  
  SCRIPT_PYTHON += git-remote-testgit.py
+ SCRIPT_PYTHON += git-p4.py
  
  SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
  	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
@@@ -1849,13 -1850,6 +1850,13 @@@ DEFAULT_PAGER_CQ_SQ = $(subst ','\'',$(
  BASIC_CFLAGS += -DDEFAULT_PAGER='$(DEFAULT_PAGER_CQ_SQ)'
  endif
  
 +ifdef SHELL_PATH
 +SHELL_PATH_CQ = "$(subst ",\",$(subst \,\\,$(SHELL_PATH)))"
 +SHELL_PATH_CQ_SQ = $(subst ','\'',$(SHELL_PATH_CQ))
 +
 +BASIC_CFLAGS += -DSHELL_PATH='$(SHELL_PATH_CQ_SQ)'
 +endif
 +
  ALL_CFLAGS += $(BASIC_CFLAGS)
  ALL_LDFLAGS += $(BASIC_LDFLAGS)