diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 23:59:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 23:59:30 (GMT) |
| commit | b2f6eab4027beaaa7415e70dad269bdc7cc27722 (patch) | |
| tree | 2e6088ca17b4042ccf9c658148cd5af55021c8a1 /http-walker.c | |
| parent | 06316234accdcb6608506aed6600cd60ff5c5c8e (diff) | |
| parent | fbcda3c0a72cbcc105100ebef1b1dae54d854204 (diff) | |
| download | git-b2f6eab4027beaaa7415e70dad269bdc7cc27722.zip git-b2f6eab4027beaaa7415e70dad269bdc7cc27722.tar.gz git-b2f6eab4027beaaa7415e70dad269bdc7cc27722.tar.bz2 | |
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 'http-walker.c')
| -rw-r--r-- | http-walker.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/http-walker.c b/http-walker.c index 18bd650..9bc8114 100644 --- a/http-walker.c +++ b/http-walker.c @@ -3,8 +3,7 @@ #include "walker.h" #include "http.h" -struct alt_base -{ +struct alt_base { char *base; int got_indices; struct packed_git *packs; @@ -18,8 +17,7 @@ enum object_request_state { COMPLETE }; -struct object_request -{ +struct object_request { struct walker *walker; unsigned char sha1[20]; struct alt_base *repo; |