diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:59:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:59:30 -0700 |
| commit | b2f6eab4027beaaa7415e70dad269bdc7cc27722 (patch) | |
| tree | 2e6088ca17b4042ccf9c658148cd5af55021c8a1 /builtin/grep.c | |
| parent | 06316234accdcb6608506aed6600cd60ff5c5c8e (diff) | |
| parent | fbcda3c0a72cbcc105100ebef1b1dae54d854204 (diff) | |
| download | git-b2f6eab4027beaaa7415e70dad269bdc7cc27722.tar.gz git-b2f6eab4027beaaa7415e70dad269bdc7cc27722.tar.xz | |
Merge branch 'maint'
* maint:
Prepare draft release notes to 1.7.4.2
gitweb: highlight: replace tabs with spaces
make_absolute_path: return the input path if it points to our buffer
valgrind: ignore SSE-based strlen invalid reads
diff --submodule: split into bite-sized pieces
cherry: split off function to print output lines
branch: split off function that writes tracking info and commit subject
standardize brace placement in struct definitions
compat: make gcc bswap an inline function
enums: omit trailing comma for portability
Conflicts:
RelNotes
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 5afee2f3a..eaf8560a5 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -40,8 +40,7 @@ enum work_type {WORK_SHA1, WORK_FILE}; * threads. The producer adds struct work_items to 'todo' and the * consumers pick work items from the same array. */ -struct work_item -{ +struct work_item { enum work_type type; char *name; |