From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: "Dennis Kaarsemaker" <dennis@kaarsemaker.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 09/16] pager: make pager_program a file-local static
Date: Mon, 12 Sep 2016 20:23:48 -0700 [thread overview]
Message-ID: <20160913032348.btinenvjy6y2xsbg@sigill.intra.peff.net> (raw)
In-Reply-To: <20160913032242.coyuhyhn6uklewuk@sigill.intra.peff.net>
This variable is only ever used by the routines in pager.c,
and other parts of the code should always use those routines
(like git_pager()) to make decisions about which pager to
use. Let's reduce its scope to prevent accidents.
Signed-off-by: Jeff King <peff@peff.net>
---
cache.h | 1 -
environment.c | 1 -
| 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index 6738050..4f23952 100644
--- a/cache.h
+++ b/cache.h
@@ -1786,7 +1786,6 @@ extern void write_file(const char *path, const char *fmt, ...);
/* pager.c */
extern void setup_pager(void);
-extern const char *pager_program;
extern int pager_in_use(void);
extern int pager_use_color;
extern int term_columns(void);
diff --git a/environment.c b/environment.c
index ca72464..c266428 100644
--- a/environment.c
+++ b/environment.c
@@ -40,7 +40,6 @@ size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
size_t delta_base_cache_limit = 96 * 1024 * 1024;
unsigned long big_file_threshold = 512 * 1024 * 1024;
-const char *pager_program;
int pager_use_color = 1;
const char *editor_program;
const char *askpass_program;
--git a/pager.c b/pager.c
index d747f50..8aa0a82 100644
--- a/pager.c
+++ b/pager.c
@@ -7,6 +7,7 @@
#endif
static struct child_process pager_process = CHILD_PROCESS_INIT;
+static const char *pager_program;
static void wait_for_pager(int in_signal)
{
--
2.10.0.230.g6f8d04b
next prev parent reply other threads:[~2016-09-13 3:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 3:22 [PATCH 0/16] fix config-reading in non-repos Jeff King
2016-09-13 3:23 ` [PATCH 01/16] t1007: factor out repeated setup Jeff King
2016-09-13 21:42 ` Stefan Beller
2016-09-13 3:23 ` [PATCH 02/16] hash-object: always try to set up the git repository Jeff King
2016-09-13 3:23 ` [PATCH 03/16] patch-id: use RUN_SETUP_GENTLY Jeff King
2016-09-13 3:23 ` [PATCH 04/16] diff: skip implicit no-index check when given --no-index Jeff King
2016-09-13 3:23 ` [PATCH 05/16] diff: handle --no-index prefixes consistently Jeff King
2016-09-13 3:23 ` [PATCH 06/16] diff: always try to set up the repository Jeff King
2016-09-13 22:00 ` Stefan Beller
2016-09-13 22:22 ` Jeff King
2016-09-13 3:23 ` [PATCH 07/16] pager: remove obsolete comment Jeff King
2016-09-13 3:23 ` [PATCH 08/16] pager: stop loading git_default_config() Jeff King
2016-09-13 3:23 ` Jeff King [this message]
2016-09-13 3:23 ` [PATCH 10/16] pager: use callbacks instead of configset Jeff King
2016-09-13 3:23 ` [PATCH 11/16] pager: handle early config Jeff King
2016-09-13 3:24 ` [PATCH 12/16] t1302: use "git -C" Jeff King
2016-09-13 3:24 ` [PATCH 13/16] test-config: setup git directory Jeff King
2016-09-13 3:24 ` [PATCH 14/16] config: only read .git/config from configured repos Jeff King
2016-09-13 3:24 ` [PATCH 15/16] init: expand comments explaining config trickery Jeff King
2016-09-13 3:24 ` [PATCH 16/16] init: reset cached config when entering new repo Jeff King
2016-09-13 22:18 ` Stefan Beller
2016-09-14 10:55 ` [PATCH 0/16] fix config-reading in non-repos Dennis Kaarsemaker
2016-09-14 15:31 ` 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=20160913032348.btinenvjy6y2xsbg@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/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).