1
0
mirror of https://github.com/git/git.git synced 2024-10-02 05:21:23 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Jonathan Nieder 030149a4dc git --paginate: paginate external commands again
73e25e7c (git --paginate: do not commit pager choice too early,
2010-06-26) failed to take some cases into account.

1b. Builtins that do not use RUN_SETUP (like git config) do
    not find GIT_DIR set correctly when the pager is launched
    from run_builtin().  So the core.pager configuration is
    not honored from subdirectories of the toplevel for them.

4a. External git commands (like git request-pull) relied on the
    early pager launch to take care of handling the -p option.
    Ever since 73e25e7c, they do not honor the -p option at all.

4b. Commands invoked through ! aliases (like ls) were also relying
    on the early pager launch.

Fix (4a) by launching the pager (if requested) before running such a
“dashed external”.  For simplicity, this still does not search for a
.git directory before running the external command; when run from a
subdirectory of the toplevel, therefore, the “[core] pager”
configuration is still not honored.

Fix (4b) by launching pager if requested before carrying out such an
alias.  Actually doing this has no effect, since the pager (if any)
would have already been launched in a failed attempt to try a
dashed external first.  The choice-of-pager-not-honored-from-
subdirectory bug still applies here, too.

(1b) is not a regression.  There is no need to fix it yet.

Noticed by Junio.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-07-14 16:07:34 -07:00
block-sha1 msvc: Fix some compiler warnings 2010-06-25 11:04:16 -07:00
builtin Merge branch 'cp/textconv-cat-file' 2010-06-27 12:07:55 -07:00
compat Merge branch 'js/async-thread' 2010-06-21 06:02:45 -07:00
contrib Merge branch 'sb/format-patch-signature' 2010-06-22 09:45:22 -07:00
Documentation Git 1.7.2-rc0 2010-06-27 12:16:06 -07:00
git_remote_helpers Remove python 2.5'isms 2010-06-13 20:02:50 -07:00
git-gui
gitk-git
gitweb Merge branch 'jn/gitweb-return-or-exit-cleanup' 2010-06-22 09:45:22 -07:00
perl Git.pm: better error message 2010-06-18 08:49:03 -07:00
ppc
t git --paginate: paginate external commands again 2010-07-14 16:07:34 -07:00
templates
xdiff
.gitattributes
.gitignore
.mailmap
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h Merge branch 'cp/textconv-cat-file' 2010-06-27 12:07:55 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'cp/textconv-cat-file' 2010-06-27 12:07:55 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c Merge branch 'rs/diff-no-minimal' into maint 2010-06-21 05:38:50 -07:00
command-list.txt
commit.c
commit.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
config.c Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
config.mak.in Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
configure.ac Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
connect.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
convert.c Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c Merge branch 'rr/parse-date-refactor' 2010-06-21 06:02:47 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'ab/blame-textconv' 2010-06-27 12:07:44 -07:00
diff.h Merge branch 'ab/blame-textconv' 2010-06-27 12:07:44 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'jc/maint-simpler-common-prefix' 2010-06-22 09:45:23 -07:00
dir.h
editor.c
entry.c
environment.c Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
exec_cmd.c Merge branch 'cw/maint-exec-defpath' into maint 2010-06-16 16:33:47 -07:00
exec_cmd.h
fast-import.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl add-interactive: Clarify “remaining hunks in the file” 2010-06-13 10:05:02 -07:00
git-am.sh Merge branch 'js/maint-am-rebase-invalid-author' 2010-06-27 12:07:44 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'pc/remove-warn' into maint 2010-06-22 08:30:38 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh git-instaweb: Add support for running gitweb via 'plackup' 2010-06-02 11:54:06 -07:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh build: propagate $DIFF to scripts 2010-06-05 09:36:13 -07:00
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--interactive.sh rebase -i: Abort cleanly if new base cannot be checked out 2010-06-11 09:01:51 -07:00
git-rebase.sh
git-relink.perl
git-remote-testgit.py Remove python 2.5'isms 2010-06-13 20:02:50 -07:00
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'tr/send-email-8bit' 2010-06-27 12:07:45 -07:00
git-sh-setup.sh
git-stash.sh
git-submodule.sh
git-svn.perl git svn: avoid unnecessary '/' in paths for SVN 2010-06-14 04:49:22 +00:00
GIT-VERSION-GEN
git-web--browse.sh
git.c git --paginate: paginate external commands again 2010-07-14 16:07:34 -07:00
git.spec.in
graph.c
graph.h
grep.c
grep.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c Merge branch 'js/async-thread' 2010-06-21 06:02:45 -07:00
http-fetch.c
http-push.c
http-walker.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
http.c Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
http.h Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
ident.c
imap-send.c
INSTALL
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
match-trees.c
merge-file.c Merge branch 'rs/diff-no-minimal' into maint 2010-06-21 05:38:50 -07:00
merge-recursive.c Merge branch 'pc/remove-warn' into maint 2010-06-22 08:30:38 -07:00
merge-recursive.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
name-hash.c
notes-cache.c
notes-cache.h
notes.c
notes.h Merge branch 'maint' 2010-06-25 11:45:27 -07:00
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h Merge branch 'sp/maint-dumb-http-pack-reidx' into maint 2010-06-16 16:21:30 -07:00
pager.c
parse-options.c parseopt: wrap rev-parse --parseopt usage for eval consumption 2010-06-13 09:38:14 -07:00
parse-options.h Merge branch 'gs/usage-to-stdout' 2010-06-21 06:02:45 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'mg/pretty-magic-space' 2010-06-22 09:45:22 -07:00
progress.c
progress.h
quote.c quote.c: separate quoting and relative path generation 2010-06-05 09:14:13 -07:00
quote.h quote.c: separate quoting and relative path generation 2010-06-05 09:14:13 -07:00
reachable.c
reachable.h
read-cache.c
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
refs.h log_ref_setup: don't return stack-allocated array 2010-06-12 09:34:17 -07:00
RelNotes Prepare draft release notes to 1.7.1.1 2010-06-16 17:00:53 -07:00
remote-curl.c Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
remote.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jn/show-num-walks' 2010-06-27 12:07:44 -07:00
revision.h
run-command.c Merge branch 'js/async-thread' 2010-06-21 06:02:45 -07:00
run-command.h
send-pack.h
server-info.c
setup.c Merge branch 'maint' 2010-06-06 18:42:12 -07:00
sha1_file.c Merge branch 'jk/maint-sha1-file-name-fix' into maint 2010-06-21 05:40:41 -07:00
sha1_name.c Merge branch 'cp/textconv-cat-file' 2010-06-27 12:07:55 -07:00
sha1-lookup.c
sha1-lookup.h
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
string-list.c
string-list.h
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-match-trees.c
test-parse-options.c
test-path-utils.c
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'bd/maint-unpack-trees-parawalk-fix' 2010-06-22 09:45:22 -07:00
unpack-trees.h
upload-pack.c
url.c url.c: "<scheme>://" part at the beginning should not be URL decoded 2010-06-23 10:42:07 -07:00
url.h
usage.c
userdiff.c Merge branch 'bs/userdiff-php' 2010-06-13 11:22:05 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c Merge branch 'pc/remove-warn' into maint 2010-06-22 08:30:38 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
wt-status.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
xdiff-interface.c
xdiff-interface.h

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.