diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-22 15:34:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-22 15:34:46 -0700 |
| commit | 423b5a104422d56645baf8229bfb496fa49c2a56 (patch) | |
| tree | a7e020cab3c1a4d7c5b4eb04da55788e25bd6b81 /streaming.h | |
| parent | 963c0407f47f5c2c73deb67613f0ac5a0615889c (diff) | |
| parent | 6b179adfe93d13c2f993668cd12eec52860486ac (diff) | |
| download | git-423b5a104422d56645baf8229bfb496fa49c2a56.tar.gz git-423b5a104422d56645baf8229bfb496fa49c2a56.tar.xz | |
Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
By Michael Haggerty (17) and others
via Junio C Hamano (36) and Jeff King (1)
* fc/git-complete-helper: (54 commits)
completion: add new __git_complete helper
Update draft release notes to 1.7.11 (11th batch)
Git 1.7.10.2
document submdule.$name.update=none option for gitmodules
The tenth batch of topics
Update draft release notes to 1.7.10.2
checkout: do not corrupt HEAD on empty repo
apply: remove lego in i18n string in gitdiff_verify_name
dir: convert to strbuf
status: refactor colopts handling
status: respect "-b" for porcelain format
status: fix null termination with "-b"
status: refactor null_termination option
commit: refactor option parsing
Documentation/git-config: describe and clarify "--local <file>" option
reflog-walk: tell explicit --date=default from not having --date at all
clone: fix progress-regression
grep.c: remove redundant line of code
checkout (detached): truncate list of orphaned commits at the new HEAD
t2020-checkout-detach: check for the number of orphaned commits
...
Diffstat (limited to 'streaming.h')
| -rw-r--r-- | streaming.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming.h b/streaming.h index 3e827709c..1d05c2a46 100644 --- a/streaming.h +++ b/streaming.h @@ -10,7 +10,7 @@ struct git_istream; extern struct git_istream *open_istream(const unsigned char *, enum object_type *, unsigned long *, struct stream_filter *); extern int close_istream(struct git_istream *); -extern ssize_t read_istream(struct git_istream *, char *, size_t); +extern ssize_t read_istream(struct git_istream *, void *, size_t); extern int stream_blob_to_fd(int fd, const unsigned char *, struct stream_filter *, int can_seek); |