diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2010-02-16 23:18:50 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-17 10:55:12 -0800 |
| commit | ab62677b1424d4e53cf222c973b841d3dada4cf3 (patch) | |
| tree | eea1673f92c67a29dfc94c016b31ba935936e473 /merge-tree.c | |
| parent | e90fdc39b6903502192b2dd11e5503cea721a1ad (diff) | |
| download | git-ab62677b1424d4e53cf222c973b841d3dada4cf3.tar.gz | |
require_work_tree broken with NONGIT_OK
With NONGIT_OK set, require_work_tree function outside a git repository
gives a syntax error. This is caused by an incorrect use of "test" that
didn't anticipate $(git rev-parse --is-inside-work-tree) may return an
empty string.
Properly quote the argument to "test", and send the standard error stream
to /dev/null to avoid giving duplicate error messages.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions