delta/git.git, branch jk/tests-write-script

t0300: use write_script helper

2012-02-04T07:01:55+00:00

t0300 creates some helper shell scripts, and marks them with
"!/bin/sh". Even though the scripts are fairly simple, they
can fail on broken shells (specifically, Solaris /bin/sh
will persist a temporary assignment to IFS in a "read"
command).

Rather than work around the problem for Solaris /bin/sh,
using write_script will make sure we point to a known-good
shell that the user has given us.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

tests: add write_script helper function

2012-02-04T07:01:07+00:00

Many of the scripts in the test suite write small helper
shell scripts to disk. It's best if these shell scripts
start with "#!$SHELL_PATH" rather than "#!/bin/sh", because
/bin/sh on some platforms is too buggy to be used.

However, it can be cumbersome to expand $SHELL_PATH, because
the usual recipe for writing a script is:

	cat >foo.sh <<-\EOF
	#!/bin/sh
	echo my arguments are "$@"
	EOF

To expand $SHELL_PATH, you have to either interpolate the
here-doc (which would require quoting "\$@"), or split the
creation into two commands (interpolating the $SHELL_PATH
line, but not the rest of the script). Let's provide a
helper function that makes that less syntactically painful.

While we're at it, this helper can also take care of the
"chmod +x" that typically comes after the creation of such a
script, saving the caller a line.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Git 1.7.9

2012-01-27T19:31:02+00:00

Signed-off-by: Junio C Hamano

INSTALL: warn about recent Fedora breakage

2012-01-27T05:51:29+00:00

Recent releases of Redhat/Fedora are reported to ship Perl binary package
with some core modules stripped away (see http://lwn.net/Articles/477234/)
against the upstream Perl5 people's wishes. The Time::HiRes module used by
gitweb one of them.

Signed-off-by: Junio C Hamano

git-completion: workaround zsh COMPREPLY bug

2012-01-26T22:03:51+00:00

zsh adds a backslash (foo\ ) for each item in the COMPREPLY array if IFS
doesn't contain spaces. This issue has been reported[1], but there is no
solution yet.

This wasn't a problem due to another bug[2], which was fixed in zsh
version 4.3.12. After this change, 'git checkout ma' would resolve
to 'git checkout master\ '.

Aditionally, the introduction of __gitcomp_nl in commit a31e626
(completion: optimize refs completion) in git also made the problem
apparent, as Matthieu Moy reported.

The simplest and most generic solution is to hide all the changes we do
to IFS, so that "foo \nbar " is recognized by zsh as "foo bar". This
works on versions of git before and after the introduction of
__gitcomp_nl (a31e626), and versions of zsh before and after 4.3.12.

Once zsh is fixed, we should conditionally disable this workaround to
have the same benefits as bash users.

[1] http://www.zsh.org/mla/workers/2012/msg00053.html
[2] http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=commitdiff;h=2e25dfb8fd38dbef0a306282ffab1d343ce3ad8d

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

docs: minor grammar fixes for v1.7.9 release notes

2012-01-26T19:09:08+00:00

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Fix typo in 1.7.9 release notes

2012-01-23T18:11:13+00:00

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

Git 1.7.9-rc2

2012-01-18T23:53:35+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2012-01-18T23:52:08+00:00

* maint:
  Git 1.7.8.4
  Git 1.7.7.6
  diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
	GIT-VERSION-GEN

Git 1.7.8.4

2012-01-18T23:51:00+00:00

Signed-off-by: Junio C Hamano