summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-17 22:59:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-17 22:59:27 (GMT)
commitdd9d290bc983255a24c70e26e7fad40c6212b636 (patch)
tree6ba2beb3a4fad91a7541e048d1dd24a8de9f7aa4 /builtin.h
parent430fac9e5bdf24a2969f854ff0ff376140f88090 (diff)
parent900647104e02e545064789f3c6b90a5807fba07b (diff)
downloadgit-dd9d290bc983255a24c70e26e7fad40c6212b636.zip
git-dd9d290bc983255a24c70e26e7fad40c6212b636.tar.gz
git-dd9d290bc983255a24c70e26e7fad40c6212b636.tar.bz2
Merge branch 'ks/no-textconv-symlink'
* 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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin.h b/builtin.h
index f2a25a0..8dd4569 100644
--- a/builtin.h
+++ b/builtin.h
@@ -36,7 +36,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);