gitweb.git
vcs-svn: Unclutter handle_node by introducing have_prop... Jonathan Nieder Sat, 20 Nov 2010 00:47:41 +0000 (18:47 -0600)

vcs-svn: Unclutter handle_node by introducing have_props var

It is possible for a path node in an SVN-format dump file to leave out
the properties section. svn-fe handles this by carrying over the
properties (in particular, file type) from the old version of that
node.

To support this, handle_node tests several times whether a
Prop-content-length field is present. Ancient Subversion actually
leaves out the Prop-content-length field even for nodes with
properties, so that's not quite the right check. Besides, this detail
of mechanism is distracting when the question at hand is instead what
content the new node should have.

So introduce a local have_props variable. The semantics are the same
as before; the adaptations to support ancient streams that leave out
the prop-content-length can wait until someone needs them.

Signed-off-by: Jonathan Nieder <jrnieer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

vcs-svn: Eliminate node_ctx.mark globalJonathan Nieder Sat, 20 Nov 2010 00:46:54 +0000 (18:46 -0600)

vcs-svn: Eliminate node_ctx.mark global

The mark variable is only used in handle_node(). Its life is
very short and simple: first, a new mark number is allocated if
this node has text attached, then that mark is recorded in the
in-core tree being built up, and lastly the mark is communicated
to fast-import in the stream along with the associated text.

A new reader may worry about interaction with other code, especially
since mark is not initialized to zero in handle_node() itself.
Disperse such worries by making it local. No functional change
intended.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

vcs-svn: Eliminate node_ctx.srcRev globalJonathan Nieder Sat, 20 Nov 2010 00:46:22 +0000 (18:46 -0600)

vcs-svn: Eliminate node_ctx.srcRev global

The srcRev variable is only used in handle_node(); its purpose
is to hold the old mode for a path, to only be used if properties
are not being changed. Narrow its scope to make its meaningful
lifetime more obvious.

No functional change intended. Add some tests as a sanity-check
for the simplest case (no renames).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

vcs-svn: Check for errors from open()Jonathan Nieder Sat, 20 Nov 2010 00:46:06 +0000 (18:46 -0600)

vcs-svn: Check for errors from open()

test-svn-fe segfaults when passed a bogus path. Simplify debugging by
exiting with a meaningful error message instead.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

vcs-svn: Allow simple v3 dumps (no deltas yet)David Barr Thu, 18 Nov 2010 05:03:51 +0000 (23:03 -0600)

vcs-svn: Allow simple v3 dumps (no deltas yet)

Since the dumpfile version 1 days, the Subversion dump format
gained some new fields:

- a unique identifier for the repository (version 2 format)
- whether the text and properties for a node should be
interpreted as deltas
- checksums for a delta's preimage
- SHA-1 sums as alternatives to the existing MD5 checksums for
copy source and the payload (delta).

For now what is relevant to us is the Text-delta and Prop-delta
fields, since not noticing these causes a dump file to be
misinterpreted (see the previous commit).

[jn: with tests]

Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

vcs-svn: Error out for v3 dumpsJonathan Nieder Thu, 18 Nov 2010 05:02:48 +0000 (23:02 -0600)

vcs-svn: Error out for v3 dumps

By ignoring the Text-Delta and Prop-Delta node fields, current svn-fe
happily mistakes deltas for full text and instead of cleanly erroring
out, it produces a valid but semantically bogus fast-import stream
when fed a dump file in the modern "svnadmin dump --deltas" format.

Dump file parsers are supposed to ignore header fields they don't
understand (to allow for backward-compatible extensions), but they are
also supposed to check the SVN-fs-dump-format-version header to
prevent misinterpretation of non backward-compatible extensions.
Do so.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jl/maint-pull-tags-doc'Junio C Hamano Wed, 17 Nov 2010 23:02:35 +0000 (15:02 -0800)

Merge branch 'jl/maint-pull-tags-doc'

* jl/maint-pull-tags-doc:
pull: Remove --tags option from manpage

Merge branch 'kb/maint-submodule-savearg'Junio C Hamano Wed, 17 Nov 2010 23:02:12 +0000 (15:02 -0800)

Merge branch 'kb/maint-submodule-savearg'

* kb/maint-submodule-savearg:
submodule: only preserve flags across recursive status/update invocations
submodule: preserve all arguments exactly when recursing

Merge branch 'jk/missing-config'Junio C Hamano Wed, 17 Nov 2010 23:02:08 +0000 (15:02 -0800)

Merge branch 'jk/missing-config'

* jk/missing-config:
config: treat non-existent config files as empty

Merge branch 'kb/maint-diff-ws-check'Junio C Hamano Wed, 17 Nov 2010 23:01:47 +0000 (15:01 -0800)

Merge branch 'kb/maint-diff-ws-check'

* kb/maint-diff-ws-check:
diff: handle lines containing only whitespace and tabs better
test-lib: extend test_decode_color to handle more color codes

Merge branch 'bg/maint-gitweb-test-lib'Junio C Hamano Wed, 17 Nov 2010 23:01:37 +0000 (15:01 -0800)

Merge branch 'bg/maint-gitweb-test-lib'

* bg/maint-gitweb-test-lib:
t/gitweb-lib: Don't pass constant to decode_utf8

Conflicts:
t/gitweb-lib.sh

Merge branch 'jm/mailmap'Junio C Hamano Wed, 17 Nov 2010 23:01:26 +0000 (15:01 -0800)

Merge branch 'jm/mailmap'

* jm/mailmap:
t4203: do not let "git shortlog" DWIM based on tty
t4203 (mailmap): stop hardcoding commit ids and dates
mailmap: fix use of freed memory

Merge branch 'tr/maint-git-repack-tmpfile'Junio C Hamano Wed, 17 Nov 2010 23:01:23 +0000 (15:01 -0800)

Merge branch 'tr/maint-git-repack-tmpfile'

* tr/maint-git-repack-tmpfile:
repack: place temporary packs under .git/objects/pack/

Merge branch 'jk/maint-apply-no-binary'Junio C Hamano Wed, 17 Nov 2010 23:01:18 +0000 (15:01 -0800)

Merge branch 'jk/maint-apply-no-binary'

* jk/maint-apply-no-binary:
apply: don't segfault on binary files with missing data

Merge branch 'jk/push-progress'Junio C Hamano Wed, 17 Nov 2010 23:01:00 +0000 (15:01 -0800)

Merge branch 'jk/push-progress'

* jk/push-progress:
push: pass --progress down to git-pack-objects
t5523-push-upstream: test progress messages
t5523-push-upstream: add function to ensure fresh upstream repo
test_terminal: ensure redirections work reliably
test_terminal: catch use without TTY prerequisite
test-lib: allow test code to check the list of declared prerequisites
tests: test terminal output to both stdout and stderr
tests: factor out terminal handling from t7006

Merge branch 'tr/maint-merge-file-subdir'Junio C Hamano Wed, 17 Nov 2010 23:00:56 +0000 (15:00 -0800)

Merge branch 'tr/maint-merge-file-subdir'

* tr/maint-merge-file-subdir:
merge-file: correctly find files when called in subdir
prefix_filename(): safely handle the case where pfx_len=0

Merge branch 'jn/send-pack-error'Junio C Hamano Wed, 17 Nov 2010 23:00:51 +0000 (15:00 -0800)

Merge branch 'jn/send-pack-error'

* jn/send-pack-error:
send-pack: avoid redundant "pack-objects died with strange error"

Merge branch 'mg/make-prove'Junio C Hamano Wed, 17 Nov 2010 23:00:46 +0000 (15:00 -0800)

Merge branch 'mg/make-prove'

* mg/make-prove:
test: allow running the tests under "prove"

Merge branch 'kb/completion-checkout'Junio C Hamano Wed, 17 Nov 2010 23:00:42 +0000 (15:00 -0800)

Merge branch 'kb/completion-checkout'

* kb/completion-checkout:
completion: Support the DWIM mode for git checkout

Merge branch 'sg/completion'Junio C Hamano Wed, 17 Nov 2010 23:00:11 +0000 (15:00 -0800)

Merge branch 'sg/completion'

* sg/completion:
bash: support pretty format aliases
bash: support more 'git notes' subcommands and their options
bash: not all 'git bisect' subcommands make sense when not bisecting
bash: offer refs for 'git bisect start'

Merge branch 'sg/bisect'Junio C Hamano Wed, 17 Nov 2010 23:00:03 +0000 (15:00 -0800)

Merge branch 'sg/bisect'

* sg/bisect:
bisect: check for mandatory argument of 'bisect replay'
bisect: improve error msg of 'bisect reset' when original HEAD is deleted
bisect: improve error message of 'bisect log' while not bisecting

Merge branch 'ak/submodule-sync'Junio C Hamano Wed, 17 Nov 2010 22:59:54 +0000 (14:59 -0800)

Merge branch 'ak/submodule-sync'

* ak/submodule-sync:
submodule sync: Update "submodule.<name>.url" for empty directories

Merge branch 'jk/maint-rev-list-nul'Junio C Hamano Wed, 17 Nov 2010 22:59:33 +0000 (14:59 -0800)

Merge branch 'jk/maint-rev-list-nul'

* jk/maint-rev-list-nul:
rev-list: handle %x00 NUL in user format

Merge branch 'ks/no-textconv-symlink'Junio C Hamano Wed, 17 Nov 2010 22:59:27 +0000 (14:59 -0800)

Merge branch 'ks/no-textconv-symlink'

* ks/no-textconv-symlink:
blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
blame,cat-file: Prepare --textconv tests for correctly-failing conversion program

Merge branch 'jn/gitweb-test'Junio C Hamano Wed, 17 Nov 2010 22:59:22 +0000 (14:59 -0800)

Merge branch 'jn/gitweb-test'

* jn/gitweb-test:
gitweb/Makefile: Include gitweb/config.mak
gitweb/Makefile: Add 'test' and 'test-installed' targets
t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
gitweb: Move call to evaluate_git_version after evaluate_gitweb_config

Merge branch 'cb/diff-fname-optim'Junio C Hamano Wed, 17 Nov 2010 22:59:16 +0000 (14:59 -0800)

Merge branch 'cb/diff-fname-optim'

* cb/diff-fname-optim:
diff: avoid repeated scanning while looking for funcname
do not search functions for patch ID
add rebase patch id tests

Merge branch 'jk/no-textconv-symlink'Junio C Hamano Wed, 17 Nov 2010 22:59:10 +0000 (14:59 -0800)

Merge branch 'jk/no-textconv-symlink'

* jk/no-textconv-symlink:
diff: don't use pathname-based diff drivers for symlinks

Merge branch 'dk/maint-blame-el'Junio C Hamano Wed, 17 Nov 2010 22:59:04 +0000 (14:59 -0800)

Merge branch 'dk/maint-blame-el'

* dk/maint-blame-el:
git-blame.el: Add (require 'format-spec)

Merge branch 'maint'Junio C Hamano Wed, 17 Nov 2010 21:57:58 +0000 (13:57 -0800)

Merge branch 'maint'

* maint:
clean: remove redundant variable baselen
Documentation/git-pull: clarify configuration
Document that rev-list --graph triggers parent rewriting.
clean: avoid quoting twice
document sigchain api
Keep together options controlling the behaviour of diffcore-rename.
t3402: test "rebase -s<strategy> -X<opt>"

clean: remove redundant variable baselenNguyễn Thái Ngọc Duy Mon, 15 Nov 2010 06:42:44 +0000 (13:42 +0700)

clean: remove redundant variable baselen

baselen used to be the result of common_prefix() when it was made
builtin. Since 1d8842d (Add 'fill_directory()' helper function for
directory traversal - 2009-05-14), its value will always be
zero. Remove it because it's no longer variable.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'mz/maint-rebase-X-fix' into maintJunio C Hamano Wed, 17 Nov 2010 21:18:19 +0000 (13:18 -0800)

Merge branch 'mz/maint-rebase-X-fix' into maint

* mz/maint-rebase-X-fix:
t3402: test "rebase -s<strategy> -X<opt>"

Documentation/git-pull: clarify configurationMartin von Zweigbergk Fri, 12 Nov 2010 18:55:58 +0000 (19:55 +0100)

Documentation/git-pull: clarify configuration

The sentence about 'branch.<name>.rebase' refers to the first sentence
in the paragraph and not to the sentence about avoiding rebasing
non-local changes. Clarify this.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Document that rev-list --graph triggers parent rewriting.Yann Dirson Fri, 12 Nov 2010 08:48:58 +0000 (09:48 +0100)

Document that rev-list --graph triggers parent rewriting.

This may help to understand why --graph causes more comments to
be selected.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

clean: avoid quoting twiceNguyễn Thái Ngọc Duy Mon, 15 Nov 2010 10:12:44 +0000 (17:12 +0700)

clean: avoid quoting twice

qname is the result of quote_path_relative(), which does
quote_c_style_counted() internally. Remove the hard-coded quotes.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

document sigchain apiJeff King Fri, 12 Nov 2010 04:24:56 +0000 (23:24 -0500)

document sigchain api

It's pretty straightforward, but a stripped-down example
never hurts. And we should make clear that it is explicitly
OK to use SIG_DFL and SIG_IGN.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Keep together options controlling the behaviour of... Yann Dirson Wed, 10 Nov 2010 20:27:13 +0000 (21:27 +0100)

Keep together options controlling the behaviour of diffcore-rename.

It makes little sense to have --diff-filter in the middle of them, and
even spares an ifndef::git-format-patch.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800)

Merge branch 'maint'

* maint:
rebase -X: do not clobber strategy

tests: use test_cmp instead of piping to diff(1)Ævar Arnfjörð Bjarmason Sun, 14 Nov 2010 14:44:16 +0000 (14:44 +0000)

tests: use test_cmp instead of piping to diff(1)

Change submodule tests that piped to diff(1) to use test_cmp. The
resulting unified diff is easier to read.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7004-tag.sh: re-arrange git tag comment for clarityÆvar Arnfjörð Bjarmason Sun, 14 Nov 2010 14:44:15 +0000 (14:44 +0000)

t7004-tag.sh: re-arrange git tag comment for clarity

Split the "message in editor has initial comment" test into three
tests. The motivation is to be able to only skip the middle part under
NO_GETTEXT_POISON.

In addition the return value of 'git tag' was being returned. We now
check that it's non-zero. I used ! instead of test_must_fail so that
the GIT_EDITOR variable was only used in this command invocation, and
because the surrounding tests use this style.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3402: test "rebase -s<strategy> -X<opt>"Junio C Hamano Thu, 11 Nov 2010 21:28:57 +0000 (13:28 -0800)

t3402: test "rebase -s<strategy> -X<opt>"

Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase -X: do not clobber strategyMartin von Zweigbergk Wed, 10 Nov 2010 07:14:26 +0000 (08:14 +0100)

rebase -X: do not clobber strategy

If any strategy options are passed to -X, the strategy will always be
set to 'recursive'. According to the documentation, it should default to
'recursive' if it is not set, but it should be possible to set it to
other values.

This fixes a regression introduced in v1.7.3-rc0~67^2 (2010-07-29).

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Tue, 9 Nov 2010 17:45:16 +0000 (09:45 -0800)

Merge branch 'maint'

* maint:
Documentation: document show -s
dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout

Documentation: document show -sJonathan Nieder Tue, 9 Nov 2010 17:12:48 +0000 (11:12 -0600)

Documentation: document show -s

Git's diff machinery has supported a -s (silence diff output) option
as far back as v0.99~900 (Silent flag for show-diff, 2005-04-13), but
the option is only advertised in an odd corner of the git diff-tree
manual.

The main use is to retrieve basic metadata about a commit:

git show -s rev

Explain this in the 'git log' manual and provide an example in the
'git show' examples section. This is kind of a cop-out, since it
would be more useful to explain it in the 'git show' manual proper,
which says:

The command takes options applicable to the git
diff-tree command to control how the changes the
commit introduces are shown.

This manual page describes only the most frequently
used options.

Fixing that is a larger task for another day.

Reported-by: Will Hall <will@gnatter.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkoutNguyễn Thái Ngọc Duy Sun, 7 Nov 2010 18:04:58 +0000 (01:04 +0700)

dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout

Commit c84de70 (excluded_1(): support exclude files in index -
2009-08-20) tries to work around the fact that there is no
directory/file information in index entries, therefore
EXC_FLAG_MUSTBEDIR match would fail.

Unfortunately the workaround is flawed. This fixes it.

Reported-by: Thomas Rinderknecht <thomasr@sailguy.org>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'aw/git-p4-deletion'Junio C Hamano Fri, 5 Nov 2010 17:42:46 +0000 (10:42 -0700)

Merge branch 'aw/git-p4-deletion'

* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files

Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano Fri, 5 Nov 2010 17:41:09 +0000 (10:41 -0700)

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
git-gui: apply color information from git diff output
git-gui: use wordprocessor tab style to ensure tabs work as expected
git-gui: correct assignment of work-tree
git-gui: use full dialog width for old name when renaming branch
git-gui: generic version trimming
git-gui: enable the Tk console when tracing/debugging on Windows
git-gui: show command-line errors in a messagebox on Windows
On Windows, avoid git-gui to call Cygwin's nice utility

Merge branch 'maint'Junio C Hamano Fri, 5 Nov 2010 17:36:49 +0000 (10:36 -0700)

Merge branch 'maint'

* maint:
Fix a formatting error in git-merge.txt

pull: Remove --tags option from manpageJens Lehmann Wed, 3 Nov 2010 20:55:48 +0000 (21:55 +0100)

pull: Remove --tags option from manpage

"Fetch all tags and merge them" does not make any sense as a request at
the logical level, even though it might be more convenient to type.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule: only preserve flags across recursive status... Kevin Ballard Wed, 3 Nov 2010 06:26:25 +0000 (23:26 -0700)

submodule: only preserve flags across recursive status/update invocations

Recursive invocations of submodule update/status preserve all arguments,
so executing

git submodule update --recursive -- foo

attempts to recursively update a submodule named "foo".

Naturally, this fails as one cannot have an infinitely-deep stack of
submodules each containing a submodule named "foo". The desired behavior
is instead to update foo and then recursively update all submodules
inside of foo.

This commit accomplishes that by only saving the flags for use in the
recursive invocation.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule: preserve all arguments exactly when recursingKevin Ballard Wed, 3 Nov 2010 06:26:24 +0000 (23:26 -0700)

submodule: preserve all arguments exactly when recursing

Shell variables only hold strings, not lists of parameters,
so $orig_args after

orig_args="$@"

fails to remember where each parameter starts and ends, if
some include whitespace. So

git submodule update \
--reference='/var/lib/common objects.git' \
--recursive --init

becomes

git submodule update --reference=/var/lib/common \
objects.git --recursive --init

in the inner repositories. Use "git rev-parse --sq-quote" to
save parameters in quoted form ready for evaluation by the
shell, avoiding this problem.

Helped-By: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-blame.el: Add (require 'format-spec)David Kågedal Tue, 25 May 2010 13:44:15 +0000 (15:44 +0200)

git-blame.el: Add (require 'format-spec)

c5022f57 (git-blame.el: Change how blame information is shown,
2009-09-29) taught the "M-x git-blame" mode to format its output
in a more interesting way, making use of the format-spec function.

format-spec is included in Emacs 23 and is a useful function.
Older emacsen can get it from Gnus. In all emacsen, we need
to 'require it before use to avoid warnings:

git-blame.el:483:1:Warning: the function `format-spec' is not known to be
defined.

Reported-by: Sergei Organov <osv@javad.com>
Reported-by: Kevin Ryde <user42@zip.com.au>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

apply: don't segfault on binary files with missing... Jeff King Mon, 18 Oct 2010 18:39:17 +0000 (14:39 -0400)

apply: don't segfault on binary files with missing data

Usually when applying a binary diff generated without
--binary, it will be rejected early, as we don't even have
the full sha1 of the pre- and post-images.

However, if the diff is generated with --full-index (but not
--binary), then we will actually try to apply it. If we have
the postimage blob, then we can take a shortcut and never
even look at the binary diff at all (e.g., this can happen
when rebasing changes within a repository).

If we don't have the postimage blob, though, we try to look
at the actual fragments, of which there are none, and get a
segfault. This patch checks explicitly for that case and
complains to the user instead of segfaulting. We need to
keep the check at a low level so that the "shortcut" case
above continues to work.

We also add a test that demonstrates the segfault. While
we're at it, let's also explicitly test the shortcut case.

Reported-by: Rafaël Carré <rafael.carre@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t0003: properly quote $HOMEThomas Rast Mon, 18 Oct 2010 09:09:54 +0000 (11:09 +0200)

t0003: properly quote $HOME

6df42ab (Add global and system-wide gitattributes, 2010-09-01) forgot
to quote one instance of $HOME in the tests. This would be valid
according to POSIX, but bash 4 helpfully declines to execute the
command in question with an "ambiguous redirection" error.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

contrib/ciabot: git-describe commit instead of HEADSven Eckelmann Mon, 20 Sep 2010 09:31:22 +0000 (11:31 +0200)

contrib/ciabot: git-describe commit instead of HEAD

For each commit a shorter version of the name will be generated. This is
either the truncated hash or the output of git-describe. The
call to git-describe was only made with an empty shell variable instead
of an actual commit hash. Thus it only described the current HEAD and
not each commit we want to submit to cia.vc.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix a formatting error in git-merge.txtNathan W. Panike Fri, 29 Oct 2010 15:33:54 +0000 (10:33 -0500)

Fix a formatting error in git-merge.txt

Inside an element of an enumerated list, the second and subsequent
paragraphs need to lose their indent and have to be strung together with a
line with a single '+' on it instead. Otherwise the lines below are shown
in typewriter face, which just looks wrong.

Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: fix zsh check under bash with 'set -u'Mark Lodato Thu, 28 Oct 2010 01:08:21 +0000 (21:08 -0400)

completion: fix zsh check under bash with 'set -u'

Commit 06f44c3 (completion: make compatible with zsh) broke bash
compatibility with 'set -u': a warning was generated when checking
$ZSH_VERSION. The solution is to supply a default value, using
${ZSH_VERSION-}. Thanks to SZEDER Gábor for the fix.

Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: apply color information from git diff outputPat Thoyts Fri, 22 Oct 2010 15:14:38 +0000 (16:14 +0100)

git-gui: apply color information from git diff output

This patch extracts the ANSI color sequences from git diff output and
applies these to the diff view window. This ensures that the gui view
makes use of the current git configuration for whitespace display.

ANSI codes may include attributes, foreground and background in a single
sequence. Handle this and support bold and reverse attributes. Ignore
all other attributes.

Suggested-by: Tor Arvid Lund <torarvid@gmail.com>
Suggested-by: Junio C Hamano <gitster@pobox.com>
Tested-by: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

git-gui: use wordprocessor tab style to ensure tabs... Pat Thoyts Wed, 27 Oct 2010 22:37:31 +0000 (23:37 +0100)

git-gui: use wordprocessor tab style to ensure tabs work as expected

The Tk text widget tab style is tabular where the first tab will align to
the first tabstop and if that position is left of the current location
then just a single character space is used. With the wordprocessor style
a tab moves the next character position to the next rightmost tabstop
as expected for viewing code.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

Merge branch 'ab/send-email-perl'Junio C Hamano Wed, 27 Oct 2010 05:02:52 +0000 (22:02 -0700)

Merge branch 'ab/send-email-perl'

* ab/send-email-perl:
send-email: extract_valid_address use qr// regexes
send-email: is_rfc2047_quoted use qr// regexes
send-email: use Perl idioms in while loop
send-email: make_message_id use "require" instead of "use"
send-email: send_message die on $!, not $?
send-email: use (?:) instead of () if no match variables are needed
send-email: sanitize_address use qq["foo"], not "\"foo\""
send-email: sanitize_address use $foo, not "$foo"
send-email: use \E***\Q instead of \*\*\*
send-email: cleanup_compose_files doesn't need a prototype
send-email: unique_email_list doesn't need a prototype
send-email: file_declares_8bit_cte doesn't need a prototype
send-email: get_patch_subject doesn't need a prototype
send-email: use lexical filehandles during sending
send-email: use lexical filehandles for $compose
send-email: use lexical filehandle for opendir

Conflicts:
git-send-email.perl

Merge branch 'sb/send-email-use-to-from-input'Junio C Hamano Wed, 27 Oct 2010 05:02:03 +0000 (22:02 -0700)

Merge branch 'sb/send-email-use-to-from-input'

* sb/send-email-use-to-from-input:
send-email: Don't leak To: headers between patches
send-email: Use To: headers in patch files

Conflicts:
git-send-email.perl

Merge branch 'ab/require-perl-5.8'Junio C Hamano Wed, 27 Oct 2010 04:57:31 +0000 (21:57 -0700)

Merge branch 'ab/require-perl-5.8'

* ab/require-perl-5.8:
perl: use "use warnings" instead of -w
perl: bump the required Perl version to 5.8 from 5.6.[21]

Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano Wed, 27 Oct 2010 04:54:04 +0000 (21:54 -0700)

Merge branch 'kb/merge-recursive-rename-threshold'

* kb/merge-recursive-rename-threshold:
diff: add synonyms for -M, -C, -B
merge-recursive: option to specify rename threshold

Conflicts:
Documentation/diff-options.txt
Documentation/merge-strategies.txt

Merge branch 'jp/send-email-to-cmd'Junio C Hamano Wed, 27 Oct 2010 04:52:26 +0000 (21:52 -0700)

Merge branch 'jp/send-email-to-cmd'

* jp/send-email-to-cmd:
git-send-email.perl: Add --to-cmd

Conflicts:
git-send-email.perl

Merge branch 'as/daemon-multi-listen'Junio C Hamano Wed, 27 Oct 2010 04:50:03 +0000 (21:50 -0700)

Merge branch 'as/daemon-multi-listen'

* as/daemon-multi-listen:
daemon: allow more than one host address given via --listen
daemon: add helper function named_sock_setup

Merge branch 'dm/mergetool-vimdiff'Junio C Hamano Wed, 27 Oct 2010 04:47:11 +0000 (21:47 -0700)

Merge branch 'dm/mergetool-vimdiff'

* dm/mergetool-vimdiff:
mergetool-lib: make the three-way diff the default for vim/gvim
mergetool-lib: add a three-way diff view for vim/gvim
mergetool-lib: combine vimdiff and gvimdiff run blocks

Merge branch 'kf/post-receive-sample-hook'Junio C Hamano Wed, 27 Oct 2010 04:41:18 +0000 (21:41 -0700)

Merge branch 'kf/post-receive-sample-hook'

* kf/post-receive-sample-hook:
post-receive-email: ensure sent messages are not empty

Merge branch 'jf/merge-ignore-ws'Junio C Hamano Wed, 27 Oct 2010 04:40:54 +0000 (21:40 -0700)

Merge branch 'jf/merge-ignore-ws'

* jf/merge-ignore-ws:
merge-recursive: options to ignore whitespace changes
merge-recursive --patience
ll-merge: replace flag argument with options struct
merge-recursive: expose merge options for builtin merge

Merge branch 'ml/completion-zsh'Junio C Hamano Wed, 27 Oct 2010 04:39:03 +0000 (21:39 -0700)

Merge branch 'ml/completion-zsh'

* ml/completion-zsh:
completion: make compatible with zsh

Merge branch 'po/sendemail'Junio C Hamano Wed, 27 Oct 2010 04:37:54 +0000 (21:37 -0700)

Merge branch 'po/sendemail'

* po/sendemail:
New send-email option smtpserveroption.
Remove @smtp_host_parts variable as not used.
Minor indentation fix.

Merge branch 'en/tree-walk-optim'Junio C Hamano Wed, 27 Oct 2010 04:37:49 +0000 (21:37 -0700)

Merge branch 'en/tree-walk-optim'

* en/tree-walk-optim:
diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
tree_entry_interesting(): Make return value more specific
tree-walk: Correct bitrotted comment about tree_entry()
Document pre-condition for tree_entry_interesting

Merge branch 'maint'Junio C Hamano Tue, 26 Oct 2010 22:04:05 +0000 (15:04 -0700)

Merge branch 'maint'

* maint:
Fix copy-pasted comments related to tree diff handling.

test: allow running the tests under "prove"Michael J Gruber Thu, 14 Oct 2010 08:53:36 +0000 (10:53 +0200)

test: allow running the tests under "prove"

You can run "make DEFAULT_TEST_TARGET=prove test" to run the test under
"prove" (or $(PROVE) if set). The output is a bit easier to read when
running many tests in parallel.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Liked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Liked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix copy-pasted comments related to tree diff handling.Yann Dirson Sun, 24 Oct 2010 21:03:10 +0000 (23:03 +0200)

Fix copy-pasted comments related to tree diff handling.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix handling of git-p4 on deleted filesAndrew Waters Fri, 22 Oct 2010 12:26:02 +0000 (13:26 +0100)

Fix handling of git-p4 on deleted files

Signed-off-by: Andrew Waters <apwaters@googlemail.com>
Tested-by: Thomas Berg <merlin66b@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 1.7.3.2Junio C Hamano Fri, 22 Oct 2010 00:16:04 +0000 (17:16 -0700)

Sync with 1.7.3.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.7.3.2 v1.7.3.2Junio C Hamano Fri, 22 Oct 2010 00:14:32 +0000 (17:14 -0700)

Git 1.7.3.2

Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano Thu, 21 Oct 2010 23:26:42 +0000 (16:26 -0700)

Merge branch 'sn/doc-opt-notation' into maint

* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently

Merge branch 'mg/fix-build-remote-helpers' into maintJunio C Hamano Thu, 21 Oct 2010 23:26:38 +0000 (16:26 -0700)

Merge branch 'mg/fix-build-remote-helpers' into maint

* mg/fix-build-remote-helpers:
remote-helpers: build in platform independent directory

config: treat non-existent config files as emptyJeff King Thu, 21 Oct 2010 14:45:44 +0000 (10:45 -0400)

config: treat non-existent config files as empty

The git_config() function signals error by returning -1 in
two instances:

1. An actual error occurs in opening a config file (parse
errors cause an immediate die).

2. Of the three possible config files, none was found.

However, this second case is often not an error at all; it
simply means that the user has no configuration (they are
outside a repo, and they have no ~/.gitconfig file). This
can lead to confusing errors, such as when the bash
completion calls "git config --list" outside of a repo. If
the user has a ~/.gitconfig, the command completes
succesfully; if they do not, it complains to stderr.

This patch allows callers of git_config to distinguish
between the two cases. Error is signaled by -1, and
otherwise the return value is the number of files parsed.
This means that the traditional "git_config(...) < 0" check
for error should work, but callers who want to know whether
we parsed any files or not can still do so.

[jc: with tests from Jonathan]

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff: handle lines containing only whitespace and tabs... Kevin Ballard Wed, 20 Oct 2010 22:17:26 +0000 (15:17 -0700)

diff: handle lines containing only whitespace and tabs better

When a line contains nothing but whitespace with at least one tab
and the core.whitespace config option contains blank-at-eol, the
whitespace on the line is being printed twice, once unhighlighted
(unless otherwise matched by one of the other core.whitespace values),
and a second time highlighted for blank-at-eol.

Update the leading indentation check to stop checking when it reaches
the trailing whitespace.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test-lib: extend test_decode_color to handle more color... Kevin Ballard Wed, 20 Oct 2010 22:17:25 +0000 (15:17 -0700)

test-lib: extend test_decode_color to handle more color codes

Enhance the test_decode_color function to handle all common color codes,
including background colors and escapes that contain multiple codes.
This change necessitates changing <WHITE> to <BOLD>, so update t4034
as well.

This change is necessary for the next commit in order to test
background colors properly.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/gitweb-lib: Don't pass constant to decode_utf8Brian Gernhardt Wed, 20 Oct 2010 05:57:11 +0000 (01:57 -0400)

t/gitweb-lib: Don't pass constant to decode_utf8

Encode.pm started updating the string to decode in-place when a second
argument is passed in version 2.40.

This causes 'decode_utf8("", Encode::FB_CROAK)' to die with a message
like:

Modification of a read-only value attempted at .../Encode.pm line 216.

Work around this by passing an empty variable instead of a constant
string.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: correct assignment of work-treePat Thoyts Wed, 20 Oct 2010 13:29:56 +0000 (14:29 +0100)

git-gui: correct assignment of work-tree

git-gui currently uses its own logic to determine the work-tree setting
but 'git rev-parse --toplevel' directly returns git's work-tree value
by calling get_git_work_tree() and is therefore always correct.

This fixes an inability to handle some repository configurations. In
particular where .git is a file containing a path to the real directory
(a cross-platform symbolic link).
To continue to support older versions than 1.7.0, setting the work-tree
by normalizing the --show-cdup value is more reliable as git-dir might be
outside the work-tree entirely.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

t4203: do not let "git shortlog" DWIM based on ttyJunio C Hamano Wed, 20 Oct 2010 06:32:06 +0000 (23:32 -0700)

t4203: do not let "git shortlog" DWIM based on tty

The "shortlog" command defaults to HEAD only when its standard input is
connected to a terminal; otherwise it acts in the traditional "filter"
mode to read and summarize the "git log" output.

Two new tests added to t4203 assumed that the command always default to
HEAD, but when the standard input is closed (or connected to /dev/null),
it output empty, which is a summary of its empty input, causing the test
to break.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

{cvs,svn}import: use the new 'git read-tree --empty'Thomas Rast Mon, 18 Oct 2010 13:11:25 +0000 (15:11 +0200)

{cvs,svn}import: use the new 'git read-tree --empty'

Since fb1bb96 (read-tree: deprecate syntax without tree-ish args,
2010-09-10) not passing --empty caused a spurious warning that was
shown to the user.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Tue, 19 Oct 2010 21:15:51 +0000 (14:15 -0700)

Merge branch 'maint'

* maint:
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors

t/t9001-send-email.sh: fix stderr redirection in 'Inval... Antonio Ospite Tue, 19 Oct 2010 09:50:39 +0000 (11:50 +0200)

t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Clarify and extend the "git diff" format documentationAndreas Gruenbacher Thu, 14 Oct 2010 10:53:11 +0000 (12:53 +0200)

Clarify and extend the "git diff" format documentation

Move the similarity and dissimilarity index header description closer to
where those extended headers are described.

Describe and/or clarify the format used for file modes, pathnames, and
the index header.

Document that all "old" files refer to the state before applying the
*entire* output, and all "new" files refer to the state thereafter.

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-show-ref.txt: clarify the pattern matchingMichael J Gruber Mon, 18 Oct 2010 11:33:32 +0000 (13:33 +0200)

git-show-ref.txt: clarify the pattern matching

git-show-ref really does not do what one would expect under the name
pattern matching, so describe it.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

documentation: git-config minor cleanupsCliff Frey Mon, 18 Oct 2010 03:10:45 +0000 (20:10 -0700)

documentation: git-config minor cleanups

Change push.default's description to add hyphens between values and
descriptions to make the manpage easier to read. The html version is
readable either way.

Change status.showUntrackedFiles to make item descriptions be
sentences and to use the same asciidoc format as push.default. The
only visual change is the additions of "."

Signed-off-by: Cliff Frey <cliff@meraki.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update test script annotate-tests.sh to handle missing... Kevin Ballard Sat, 16 Oct 2010 11:09:20 +0000 (04:09 -0700)

Update test script annotate-tests.sh to handle missing/extra authors

The current script used by annotate-tests.sh (used by t8001 and t8002) fails
to emit a warning if any of the expected authors never show up in the output
or if authors that show up in the output were never specified as expected.
Update the script to fail in both of these scenarios.

Helped-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

repack: place temporary packs under .git/objects/pack/Thomas Rast Tue, 19 Oct 2010 09:50:43 +0000 (11:50 +0200)

repack: place temporary packs under .git/objects/pack/

git-pack-objects is already careful to start out its temporary packs
under .git/objects/pack/ (cf. 8b4eb6b, Do not perform cross-directory
renames when creating packs, 2008-09-22), but git-repack did not
respond in kind so the effort was lost when the filesystem boundary is
exactly at that directory.

Let git-repack pass a path under .git/objects/pack/ as the base for
its temporary packs.

This means we might need the $PACKDIR sooner (before the pack-objects
invocation), so move the mkdir up just to be safe.

Also note that the only use of *.pack is in the find invocation way
before the pack-objects call, so the temporary packs will not suddenly
show up in any wildcards because of the directory change.

Reported-by: Marat Radchenko <marat@slonopotamus.org>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

push: pass --progress down to git-pack-objectsJeff King Sat, 16 Oct 2010 18:37:03 +0000 (02:37 +0800)

push: pass --progress down to git-pack-objects

When pushing via builtin transports (like file://, git://), the
underlying transport helper (in this case, git-pack-objects) did not get
the --progress option, even if it was passed to git push.

Fix this, and update the tests to reflect this.

Note that according to the git-pack-objects documentation, we can safely
apply the usual --progress semantics for the transport commands like
clone and fetch (and for pushing over other smart transports).

Reported-by: Chase Brammer <cbrammer@gmail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t5523-push-upstream: test progress messagesTay Ray Chuan Sat, 16 Oct 2010 18:37:02 +0000 (02:37 +0800)

t5523-push-upstream: test progress messages

Reported-by: Chase Brammer <cbrammer@gmail.com>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t5523-push-upstream: add function to ensure fresh upstr... Tay Ray Chuan Sat, 16 Oct 2010 18:37:01 +0000 (02:37 +0800)

t5523-push-upstream: add function to ensure fresh upstream repo

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test_terminal: ensure redirections work reliablyJonathan Nieder Sun, 17 Oct 2010 00:38:07 +0000 (19:38 -0500)

test_terminal: ensure redirections work reliably

For terminal tests that capture output/stderr, the TTY prerequisite
warning does not quite work for commands like

test_terminal foo >out 2>err

because the warning gets "swallowed" up by the redirection that's
supposed only to be done by the subcommand.

Even worse, the outcome depends on whether stdout was already a
terminal (in which case test_terminal is a noop) or not (in which case
test_terminal introduces a pseudo-tty in the middle of the pipeline).

$ test_terminal.perl sh -c 'test -t 1 && echo >&2 YES' >out
YES
$ sh -c 'test -t 1 && echo >&2 YES' >out
$

So:

- use the test_terminal script even when running with "-v".

- skip tests that require a terminal when the test_terminal
script is unusable because IO::Pty is not installed.

- write the "need to declare TTY prerequisite" message to fd 4,
where it will be printed when running tests with -v, rather
than being swallowed up by an unrelated redireciton.

Noticed-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test_terminal: catch use without TTY prerequisiteJonathan Nieder Sat, 16 Oct 2010 18:36:59 +0000 (02:36 +0800)

test_terminal: catch use without TTY prerequisite

It is easy to forget to declare the TTY prerequisite when
writing tests on a system where it would always be satisfied
(because IO::Pty is installed; see v1.7.3-rc0~33^2, 2010-08-16
for example). Automatically detect this problem so there is
no need to remember.

test_terminal: need to declare TTY prerequisite
test_must_fail: command not found: test_terminal echo hi

test_terminal returns status 127 in this case to simulate
not being available.

Also replace the SIMPLEPAGERTTY prerequisite on one test with
"SIMPLEPAGER,TTY", since (1) the latter is supported now and
(2) the prerequisite detection relies on the TTY prereq being
explicitly declared.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test-lib: allow test code to check the list of declared... Jonathan Nieder Sat, 16 Oct 2010 18:36:58 +0000 (02:36 +0800)

test-lib: allow test code to check the list of declared prerequisites

This is plumbing to prepare helpers like test_terminal to notice buggy
test scripts that do not declare all of the necessary prerequisites.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: test terminal output to both stdout and stderrJeff King Sat, 16 Oct 2010 18:36:57 +0000 (02:36 +0800)

tests: test terminal output to both stdout and stderr

Some outputs (like the pager) care whether stdout is a
terminal. Others (like progress meters) care about stderr.

This patch sets up both. Technically speaking, we could go
further and set up just one (because either the other goes
to a terminal, or because our tests are only interested in
one). This patch does both to keep the interface to
lib-terminal simple.

Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: factor out terminal handling from t7006Jeff King Sat, 16 Oct 2010 18:36:56 +0000 (02:36 +0800)

tests: factor out terminal handling from t7006

Other tests besides the pager ones may want to check how we handle
output to a terminal. This patch makes the code reusable.

Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>