diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:24 -0800 |
| commit | 9f6774ed86a9ac22142c0b37e26e67eb1d032962 (patch) | |
| tree | 421e3ac59adf3683a03e954ebf5f2998bd34886a /builtin.h | |
| parent | Merge branch 'bc/fortran-userdiff' into maint (diff) | |
| parent | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' (diff) | |
| download | tgif-9f6774ed86a9ac22142c0b37e26e67eb1d032962.tar.xz | |
Merge branch 'ks/no-textconv-symlink' into maint
* ks/no-textconv-symlink:
blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
Diffstat (limited to 'builtin.h')
| -rw-r--r-- | builtin.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -35,7 +35,7 @@ void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c); extern int check_pager_config(const char *cmd); -extern int textconv_object(const char *path, const unsigned char *sha1, char **buf, unsigned long *buf_size); +extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, 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); |