From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jeff King" <peff@peff.net>
Subject: [PATCH jn/paginate-fix 0/12] Re: git --paginate: do not commit pager choice too early
Date: Thu, 5 Aug 2010 21:35:29 -0500 [thread overview]
Message-ID: <20100806023529.GB22369@burratino> (raw)
In-Reply-To: <7v630hyf5r.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> So delay the pager startup when possible:
>
> 1. run_argv() already commits pager choice inside run_builtin() if a
> command is found. For commands that use RUN_SETUP, waiting until
> then fixes the problem described above: once git knows where to
> look, it happily respects the core.pager setting.
>
> ... and for commands that do not use RUN_SETUP, what happens?
Let’s help some of them out a little.
These patches teach a few more built-ins to do something like
RUN_SETUP; more precisely, a RUN_SETUP_GENTLY facility is introduced
to run setup_git_directory_gently() early just like NEEDS_PREFIX has
always caused setup_git_directory() to be run early.
This series wouldn’t be possible without Duy’s recent efforts to roll
out other fixes from the famous nd/setup topic --- thanks!
The patches should be familiar[1] and I think they are better
justified now.
The first 8 patches apply on top to jn/paginate-fix from pu. Between
patch 8 and 9 I have a merge of jn/maint-setup-fix^, with the
following explanation:
Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix
That topic includes a fix for “git index-pack” (which used
to save the cwd before the repository search to work around
a bug) which is needed before the repository search can be
safely run earlier.
That merge involves a trivial conflict between adding the
RUN_SETUP_GENTLY flag for this topic and removing USE_PAGER for
grep -O. The conflict is only nominal --- the two changes do not
interfere with each other.
One final note: this series is deliberately very conservative, in that
it does not touch commands like diff (which has a --no-index mode
suppressing the repository search). Such commands are neither
helped nor hindered by this series, and I think that during this
transition time we should be opportunistic rather than rigid: the rule
is to run the repository search as soon as can be easily justified but
no sooner.
Thoughts welcome, as always.
Nguyễn Thái Ngọc Duy (12):
git wrapper: introduce startup_info struct
setup: remember whether repository was found
git wrapper: allow setup_git_directory_gently() be called earlier
shortlog: run setup_git_directory_gently() sooner
grep: run setup_git_directory_gently() sooner
apply: run setup_git_directory_gently() sooner
bundle: run setup_git_directory_gently() sooner
config: run setup_git_directory_gently() sooner
index-pack: run setup_git_directory_gently() sooner
ls-remote: run setup_git_directory_gently() sooner
var: run setup_git_directory_gently() sooner
merge-file: run setup_git_directory_gently() sooner
[1] http://thread.gmane.org/gmane.comp.version-control.git/144000/focus=144110
next prev parent reply other threads:[~2010-08-06 2:37 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-26 19:22 [PATCH 0/4] git --paginate: do not commit pager choice too early Jonathan Nieder
2010-06-26 19:23 ` [PATCH 1/4] t7006 (pager): introduce helper for parameterized tests Jonathan Nieder
2010-06-26 19:24 ` [PATCH 2/4] t7006: test pager configuration for several git commands Jonathan Nieder
2010-06-26 19:28 ` Jonathan Nieder
2010-06-26 19:25 ` [PATCH 3/4] tests: local config file should be honored from subdirs of toplevel Jonathan Nieder
2010-06-26 19:26 ` [PATCH 4/4] git --paginate: do not commit pager choice too early Jonathan Nieder
2010-06-28 9:40 ` [PATCH 0/4] " Jeff King
2010-06-28 10:13 ` Jonathan Nieder
2010-06-28 10:22 ` Jeff King
2010-06-28 12:45 ` Nguyen Thai Ngoc Duy
2010-06-29 5:42 ` Junio C Hamano
2010-07-14 20:36 ` Junio C Hamano
2010-07-14 21:30 ` Jonathan Nieder
2010-07-14 22:55 ` [PATCH] git --paginate: paginate external commands again Jonathan Nieder
2010-07-18 12:27 ` [PATCH 0/4] git --paginate: do not commit pager choice too early Nguyen Thai Ngoc Duy
2010-08-06 2:35 ` Jonathan Nieder [this message]
2010-08-06 2:40 ` [PATCH 01/12] git wrapper: introduce startup_info struct Jonathan Nieder
2010-08-06 2:46 ` [PATCH 02/12] setup: remember whether repository was found Jonathan Nieder
2010-08-06 2:52 ` [PATCH 03/12] git wrapper: allow setup_git_directory_gently() be called earlier Jonathan Nieder
2010-08-06 3:01 ` [PATCH 04/12] shortlog: run setup_git_directory_gently() sooner Jonathan Nieder
2010-08-06 3:06 ` [PATCH 05/12] grep: " Jonathan Nieder
2010-08-06 3:08 ` [PATCH 06/12] apply: " Jonathan Nieder
2010-08-15 20:13 ` Ævar Arnfjörð Bjarmason
2010-08-15 22:34 ` Nguyen Thai Ngoc Duy
2010-08-15 23:11 ` Jonathan Nieder
2010-08-16 0:36 ` [PATCH 06/12 v2] " Nguyễn Thái Ngọc Duy
2010-08-16 3:39 ` Junio C Hamano
2010-08-06 3:12 ` [PATCH 07/12] bundle: " Jonathan Nieder
2010-08-16 7:21 ` Thomas Rast
2010-08-16 8:07 ` Jonathan Nieder
2010-08-16 8:11 ` [PATCH 2/2] t7006 (pager): add missing TTY prerequisite Jonathan Nieder
2010-08-16 16:41 ` Junio C Hamano
2010-08-06 3:15 ` [PATCH 08/12] config: run setup_git_directory_gently() sooner Jonathan Nieder
2010-08-06 3:18 ` [PATCH 09/12] index-pack: " Jonathan Nieder
2010-08-06 3:20 ` [PATCH 10/12] ls-remote: " Jonathan Nieder
2010-08-06 3:21 ` [PATCH 11/12] var: " Jonathan Nieder
2010-08-06 3:27 ` [PATCH 12/12] merge-file: " Jonathan Nieder
2010-08-06 3:34 ` [PATCH master 0/2] fix "check-ref-format --branch" from subdir of toplevel Jonathan Nieder
2010-08-06 3:36 ` [PATCH 1/2] check-ref-format: handle subcommands in separate functions Jonathan Nieder
2010-08-06 3:39 ` [PATCH 2/2] Allow "check-ref-format --branch" from subdirectory Jonathan Nieder
2010-08-06 19:42 ` Junio C Hamano
2010-08-06 4:26 ` [PATCH jn/paginate-fix 0/12] Re: git --paginate: do not commit pager choice too early Nguyen Thai Ngoc Duy
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=20100806023529.GB22369@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.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).