From: Eric Wong <e@80x24.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Eric Wong" <e@80x24.org>, "Jeff King" <peff@peff.net>,
"Kyle J. McKay" <mackyle@gmail.com>,
git@vger.kernel.org,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jakub Narębski" <jnareb@gmail.com>
Subject: [PATCH 0/1 v2] add PAGER_ENV to build
Date: Mon, 1 Aug 2016 21:49:36 +0000 [thread overview]
Message-ID: <20160801214937.4752-1-e@80x24.org> (raw)
In-Reply-To: <20160801010557.22191-1-e@80x24.org>
Changes from v1:
* dropped stringify macro in favor for quoting in Makefile
(diff below)
I'm not sure I like this change, and might be inclined to
go in the opposite direction of using the stringify macro
more widely to simplify the Makefile; but that is a separate
topic.
* dropped 2/2, I don't have a good rationale for it, either,
other than "it seemed easy" after 1/2 :>
The following changes since commit f8f7adce9fc50a11a764d57815602dcb818d1816:
Sync with maint (2016-07-28 14:21:18 -0700)
are available in the git repository at:
git://bogomips.org/git-svn.git pager-env-v2
for you to fetch changes up to d3aed319c9abac006060bc81e865c93ff8363066:
pager: move pager-specific setup into the build (2016-08-01 21:46:25 +0000)
----------------------------------------------------------------
Junio C Hamano (1):
pager: move pager-specific setup into the build
Makefile | 20 +++++++++++++++++++-
config.mak.uname | 1 +
git-sh-setup.sh | 8 +++++---
| 29 +++++++++++++++++++++++++----
4 files changed, 50 insertions(+), 8 deletions(-)
interdiff from 1/1 v1:
diff --git a/Makefile b/Makefile
index fe469a6..0b36b5e 100644
--- a/Makefile
+++ b/Makefile
@@ -1591,7 +1591,6 @@ PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
DIFF_SQ = $(subst ','\'',$(DIFF))
PERLLIB_EXTRA_SQ = $(subst ','\'',$(PERLLIB_EXTRA))
-PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
# We must filter out any object files from $(GITLIBS),
# as it is typically used like:
@@ -1604,7 +1603,7 @@ PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
LIBS = $(filter-out %.o, $(GITLIBS)) $(EXTLIBS)
BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
- $(COMPAT_CFLAGS) -DPAGER_ENV='$(PAGER_ENV_SQ)'
+ $(COMPAT_CFLAGS)
LIB_OBJS += $(COMPAT_OBJS)
# Quote for C
@@ -1642,6 +1641,10 @@ ifdef DEFAULT_HELP_FORMAT
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
endif
+PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
+PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
+
ALL_CFLAGS += $(BASIC_CFLAGS)
ALL_LDFLAGS += $(BASIC_LDFLAGS)
--git a/pager.c b/pager.c
index 2f2cadc..cd1ac54 100644
--- a/pager.c
+++ b/pager.c
@@ -63,12 +63,9 @@ const char *git_pager(int stdout_is_tty)
return pager;
}
-#define stringify_(x) #x
-#define stringify(x) stringify_(x)
-
static void setup_pager_env(struct argv_array *env)
{
- const char *pager_env = stringify(PAGER_ENV);
+ const char *pager_env = PAGER_ENV;
while (*pager_env) {
struct strbuf buf = STRBUF_INIT;
--
EW
next prev parent reply other threads:[~2016-08-01 22:00 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-01 1:05 [PATCH 0/2] add PAGER_ENV to build and core.pagerEnv to config Eric Wong
2016-08-01 1:05 ` [PATCH 1/2] pager: move pager-specific setup into the build Eric Wong
2016-08-01 1:43 ` brian m. carlson
2016-08-01 7:00 ` Eric Wong
2016-08-01 8:57 ` Jakub Narębski
2016-08-01 10:40 ` brian m. carlson
2016-08-01 17:24 ` Jeff King
2016-08-01 18:07 ` Junio C Hamano
2016-08-01 17:46 ` Duy Nguyen
2016-08-01 17:52 ` Jeff King
2016-08-01 18:01 ` Duy Nguyen
2016-08-01 18:07 ` Jeff King
2016-08-01 1:05 ` [PATCH 2/2] pager: implement core.pagerEnv in config Eric Wong
2016-08-01 17:28 ` Jeff King
2016-08-01 21:49 ` Eric Wong [this message]
2016-08-01 21:49 ` [PATCH 1/1 v2] pager: move pager-specific setup into the build Eric Wong
2016-08-01 23:03 ` Junio C Hamano
2016-08-01 23:46 ` Jeff King
2016-08-02 21:14 ` Junio C Hamano
2016-08-01 23:56 ` Eric Wong
2016-08-02 21:15 ` Junio C Hamano
2016-08-03 16:19 ` Jeff King
2016-08-03 20:57 ` Junio C Hamano
2016-08-03 21:08 ` Eric Wong
2016-08-03 21:15 ` Junio C Hamano
2016-08-04 3:43 ` [PATCH v3] " Eric Wong
2016-08-04 5:34 ` Jeff King
2016-08-04 11:34 ` Eric Wong
2016-08-04 17:53 ` Jeff King
2016-08-04 11:40 ` [PATCH v4] " Eric Wong
2016-08-03 21:09 ` [PATCH 1/1 v2] " Jeff King
2016-08-01 21:59 ` [PATCH 0/1 v2] add PAGER_ENV to build Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160801214937.4752-1-e@80x24.org \
--to=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=mackyle@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).