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/cat-file.c | |
| parent | f3a70e9cc6d31e3cb8158f64be13c594226bf03f (diff) | |
| parent | 900647104e02e545064789f3c6b90a5807fba07b (diff) | |
| download | git-9f6774ed86a9ac22142c0b37e26e67eb1d032962.tar.gz | |
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/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; |