summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Gabriel Filion <lelutin@gmail.com>2010-02-16 23:18:50 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-17 10:55:12 -0800
commitab62677b1424d4e53cf222c973b841d3dada4cf3 (patch)
treeeea1673f92c67a29dfc94c016b31ba935936e473 /contrib/examples/git-resolve.sh
parentClean up work-tree handling (diff)
downloadtgif-ab62677b1424d4e53cf222c973b841d3dada4cf3.tar.xz
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 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions