diff options
| author | Kirill Smelkov <kirr@landau.phys.spbu.ru> | 2010-09-29 15:35:24 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 16:53:25 -0700 |
| commit | 900647104e02e545064789f3c6b90a5807fba07b (patch) | |
| tree | 18afcf6ef450617cf0944058d40fe9e14c93312a /builtin/cat-file.c | |
| parent | ab3b7b9a6e3bf5793520f06eb76fb03ffe8231cb (diff) | |
| download | git-900647104e02e545064789f3c6b90a5807fba07b.tar.gz | |
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/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 76ec3fec92..94632dbdb4 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -143,7 +143,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name) die("git cat-file --textconv %s: <object> must be <sha1:path>", obj_name); - if (!textconv_object(obj_context.path, sha1, &buf, &size)) + if (!textconv_object(obj_context.path, obj_context.mode, sha1, &buf, &size)) die("git cat-file --textconv: unable to run textconv on %s", obj_name); break; |