diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:31:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:31:06 -0700 |
commit | e3f26752b5e9d38e88a09671d124b61fb0cd5dbf (patch) | |
tree | fb5b5d9bc1c17bb827d97e4896d66a40c42de1ff /builtin.h | |
parent | 871e293c9acbeaacce59dcd98fab6028f552f5be (diff) | |
parent | 9a8eea9604ade731c3d0ff10136f2ae81b2a13c8 (diff) | |
download | git-e3f26752b5e9d38e88a09671d124b61fb0cd5dbf.tar.gz git-e3f26752b5e9d38e88a09671d124b61fb0cd5dbf.tar.xz |
Merge branch 'maint-1.7.11' into maint
* maint-1.7.11:
Almost 1.7.11.6
gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
rebase -i: use full onto sha1 in reflog
sh-setup: protect from exported IFS
receive-pack: do not leak output from auto-gc to standard output
t/t5400: demonstrate breakage caused by informational message from prune
setup: clarify error messages for file/revisions ambiguity
send-email: improve RFC2047 quote parsing
fsck: detect null sha1 in tree entries
do not write null sha1s to on-disk index
diff: do not use null sha1 as a sentinel value
Diffstat (limited to 'builtin.h')
-rw-r--r-- | builtin.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -43,7 +43,7 @@ extern int check_pager_config(const char *cmd); struct diff_options; extern void setup_diff_pager(struct diff_options *); -extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, char **buf, unsigned long *buf_size); +extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size); extern int cmd_add(int argc, const char **argv, const char *prefix); extern int cmd_annotate(int argc, const char **argv, const char *prefix); |