diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-03-20 00:06:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 15:25:31 (GMT) |
| commit | c40d92e4c73b44d9cb4c3ba3a0ab53464964369c (patch) | |
| tree | bfa026207215a2f6e02becf413e8404364a9e4f7 | |
| parent | 0d12e59f636b68964c80a82a58020d34a6cd5032 (diff) | |
| download | git-c40d92e4c73b44d9cb4c3ba3a0ab53464964369c.zip git-c40d92e4c73b44d9cb4c3ba3a0ab53464964369c.tar.gz git-c40d92e4c73b44d9cb4c3ba3a0ab53464964369c.tar.bz2 | |
Makefile: Fix CDPATH problem
If CDPATH is set, "cd" prints its destination to stdout, causing
the common (cd a && tar cf - .) | (cd b && tar xf -) idiom to fail.
For example:
make -C templates DESTDIR='' install
make[1]: Entering directory `/users/e477610/exptool/src/git-1.7.0.2/templates'
install -d -m 755 '/home/e477610/exptool/share/git-core/templates'
(cd blt && gtar cf - .) | \
(cd '/home/e477610/exptool/share/git-core/templates' && umask 022 && gtar xof -)
gtar: This does not look like a tar archive
Most git scripts already protect against use of CDPATH through
git-sh-setup, but the Makefile doesn’t.
Reported-by: Michael Cox <mhcox@bluezoosoftware.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -317,6 +317,12 @@ SCRIPT_PYTHON = SCRIPT_SH = TEST_PROGRAMS = +# Having this variable in your environment would break pipelines because +# you cause "cd" to echo its destination to stdout. It can also take +# scripts to unexpected places. If you like CDPATH, define it for your +# interactive shell sessions without exporting it. +unexport CDPATH + SCRIPT_SH += git-am.sh SCRIPT_SH += git-bisect.sh SCRIPT_SH += git-difftool--helper.sh |