René Scharfe 431d6e7bc8 grep: enable threading for context line printing ... If context lines are to be printed, grep separates them with hunk marks ("--\n"). These marks are printed between matches from different files, too. They are not printed before the first file, though. Threading was disabled when context line printing was enabled because avoiding to print the mark before the first line was an unsolved synchronisation problem. This patch separates the code for printing hunk marks for the threaded and the unthreaded case, allowing threading to be turned on together with the common -ABC options. ->show_hunk_mark, which controls printing of hunk marks between files in show_line(), is now set in grep_buffer_1(), but only if some results have already been printed and threading is disabled. The threaded case is handled in work_done(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-03-15 15:26:35 -07:00
..
add.c	Merge branch 'cp/add-u-pathspec'	2010-03-10 15:32:02 -08:00
annotate.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
apply.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
archive.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
bisect--helper.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
blame.c	Merge branch 'maint'	2010-03-13 21:31:42 -08:00
branch.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
bundle.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
cat-file.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
check-attr.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
check-ref-format.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
checkout-index.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
checkout.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
clean.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
clone.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
commit-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
commit.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
config.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
count-objects.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
describe.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
diff-files.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
diff-index.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
diff-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
diff.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
fast-export.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
fetch-pack.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
fetch.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
fmt-merge-msg.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
for-each-ref.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
fsck.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
gc.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
grep.c	grep: enable threading for context line printing	2010-03-15 15:26:35 -07:00
hash-object.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
help.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
index-pack.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
init-db.c	Merge branch 'sd/init-template'	2010-03-10 15:32:43 -08:00
log.c	Merge branch 'sd/format-patch-to'	2010-03-15 00:58:55 -07:00
ls-files.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
ls-remote.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
ls-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
mailinfo.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
mailsplit.c	Merge branch 'sh/am-keep-cr'	2010-03-10 15:32:34 -08:00
merge-base.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-file.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-index.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-ours.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-recursive.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
mktag.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
mktree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
mv.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
name-rev.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
notes.c	Merge branch 'jh/notes'	2010-03-15 00:52:06 -07:00
pack-objects.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
pack-redundant.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
pack-refs.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
patch-id.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
prune-packed.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
prune.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
push.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
read-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
receive-pack.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
reflog.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
remote.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
replace.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
rerere.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
reset.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
rev-list.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
rev-parse.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
revert.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
rm.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
send-pack.c	Merge branch 'ld/push-porcelain'	2010-03-15 00:58:24 -07:00
shortlog.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
show-branch.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
show-ref.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
stripspace.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
symbolic-ref.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
tag.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
tar-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
unpack-file.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
unpack-objects.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
update-index.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
update-ref.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
update-server-info.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
upload-archive.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
var.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
verify-pack.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
verify-tag.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
write-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00