summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorKirill Smelkov <kirr@landau.phys.spbu.ru>2010-09-29 11:35:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-29 23:53:25 (GMT)
commit900647104e02e545064789f3c6b90a5807fba07b (patch)
tree18afcf6ef450617cf0944058d40fe9e14c93312a /builtin.h
parentab3b7b9a6e3bf5793520f06eb76fb03ffe8231cb (diff)
downloadgit-900647104e02e545064789f3c6b90a5807fba07b.zip
git-900647104e02e545064789f3c6b90a5807fba07b.tar.gz
git-900647104e02e545064789f3c6b90a5807fba07b.tar.bz2
blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
We need to get the correct mode when blame reads the source from the working tree, the index, or trees. This allows us to omit running textconv filters on symbolic links. Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Reviewed-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 ed6ee26..98b1e85 100644
--- a/builtin.h
+++ b/builtin.h
@@ -37,7 +37,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);