summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Brandon Williams <bmwill@google.com>2017-03-17 11:41:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-18 10:02:01 -0700
commit2225e1ea20481a7c0da526891470abf9ece623e7 (patch)
treec6de5c5c54d07579ee2ccb75b8125550fb2e9eab /git-mergetool--lib.sh
parentgrep: set default output method (diff)
downloadtgif-2225e1ea20481a7c0da526891470abf9ece623e7.tar.xz
grep: fix builds with with no thread support
Commit 0281e487fd91 ("grep: optionally recurse into submodules") added functions grep_submodule() and grep_submodule_launch() which use "struct work_item" which is defined only when thread support is available. The original implementation of grep_submodule() used the "struct work_item" in order to gain access to a strbuf to store its output which was to be printed at a later point in time. This differs from how both grep_file() and grep_sha1() handle their output. This patch eliminates the reliance on the "struct work_item" and instead opts to use the output function stored in the output field of the "struct grep_opt" object directly, making it behave similarly to both grep_file() and grep_sha1(). Reported-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com> Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions