From: Olga Telezhnaya <olyatelezhnaya@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH RFC 11/20] cat-file: move filter_object to diff.c
Date: Fri, 22 Feb 2019 16:05:45 +0000 [thread overview]
Message-ID: <0102016915f49a5f-d96e159b-149d-40f9-9789-d0859dc7e2e9-000000@eu-west-1.amazonses.com> (raw)
In-Reply-To: <0102016915f499b8-5813fc52-230b-469e-b939-a1244e83a2b9-000000@eu-west-1.amazonses.com>
Move function filter_object to diff.c, like it is done with
function textconv_object.
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
---
builtin/cat-file.c | 23 -----------------------
diff.c | 23 +++++++++++++++++++++++
diff.h | 4 ++++
3 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index cd9a4447c8da9..41f333b73d851 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -3,7 +3,6 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
-#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h"
#include "config.h"
#include "builtin.h"
@@ -34,28 +33,6 @@ static int mark_query;
static int skip_object_info;
static const char *rest;
-static int filter_object(const char *path, unsigned mode,
- const struct object_id *oid,
- char **buf, unsigned long *size)
-{
- enum object_type type;
-
- *buf = read_object_file(oid, &type, size);
- if (!*buf)
- return error(_("cannot read object %s '%s'"),
- oid_to_hex(oid), path);
- if ((type == OBJ_BLOB) && S_ISREG(mode)) {
- struct strbuf strbuf = STRBUF_INIT;
- if (convert_to_working_tree(&the_index, path, *buf, *size, &strbuf)) {
- free(*buf);
- *size = strbuf.len;
- *buf = strbuf_detach(&strbuf, NULL);
- }
- }
-
- return 0;
-}
-
static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
int unknown_type)
{
diff --git a/diff.c b/diff.c
index 5306c48652db5..fe7160c86755d 100644
--- a/diff.c
+++ b/diff.c
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2005 Junio C Hamano
*/
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h"
#include "config.h"
#include "tempfile.h"
@@ -6524,6 +6525,28 @@ int textconv_object(struct repository *r,
return 1;
}
+int filter_object(const char *path, unsigned mode,
+ const struct object_id *oid,
+ char **buf, unsigned long *size)
+{
+ enum object_type type;
+
+ *buf = read_object_file(oid, &type, size);
+ if (!*buf)
+ return error(_("cannot read object %s '%s'"),
+ oid_to_hex(oid), path);
+ if ((type == OBJ_BLOB) && S_ISREG(mode)) {
+ struct strbuf strbuf = STRBUF_INIT;
+ if (convert_to_working_tree(&the_index, path, *buf, *size, &strbuf)) {
+ free(*buf);
+ *size = strbuf.len;
+ *buf = strbuf_detach(&strbuf, NULL);
+ }
+ }
+
+ return 0;
+}
+
void setup_diff_pager(struct diff_options *opt)
{
/*
diff --git a/diff.h b/diff.h
index b512d0477ac3a..c3709e611870a 100644
--- a/diff.h
+++ b/diff.h
@@ -476,6 +476,10 @@ int textconv_object(struct repository *repo,
const struct object_id *oid, int oid_valid,
char **buf, unsigned long *buf_size);
+int filter_object(const char *path, unsigned mode,
+ const struct object_id *oid,
+ char **buf, unsigned long *size);
+
int parse_rename_score(const char **cp_p);
long parse_algorithm_value(const char *value);
--
https://github.com/git/git/pull/568
next prev parent reply other threads:[~2019-02-22 16:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 15:50 [PATCH RFC 0/20] cat-file: start using formatting logic from ref-filter Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 01/20] cat-file: reuse struct ref_format Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 12/20] cat-file: remove batch_write function Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 02/20] ref-filter: rename field in ref_array_item stuct Olga Telezhnaya
2019-02-28 21:06 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 16/20] for-each-ref: tests for new atom %(raw) added Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 07/20] cat-file: remove skip_object_info Olga Telezhnaya
2019-02-28 21:26 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 06/20] cat-file: remove mark_query from expand_data Olga Telezhnaya
2019-02-28 21:25 ` Jeff King
2019-03-03 9:41 ` Christian Couder
2019-02-22 16:05 ` [PATCH RFC 09/20] ref-filter: make expand_data global Olga Telezhnaya
2019-02-28 21:30 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 04/20] for-each-ref: tests for new atom %(rest) added Olga Telezhnaya
2019-02-28 21:11 ` Jeff King
2019-03-01 6:10 ` Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 19/20] cat-file: tests for new atoms added Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 15/20] ref-filter: add raw formatting option Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 03/20] ref-filter: add rest " Olga Telezhnaya
2019-02-28 21:07 ` Jeff King
2019-02-22 16:05 ` Olga Telezhnaya [this message]
2019-02-22 16:05 ` [PATCH RFC 17/20] cat-file: reuse ref-filter formatting logic Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 08/20] cat-file: remove rest from expand_data Olga Telezhnaya
2019-02-28 21:27 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 18/20] cat-file: get rid of expand_data Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 10/20] cat-file: inline stream_blob Olga Telezhnaya
2019-02-28 21:33 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 05/20] cat-file: remove split_on_whitespace Olga Telezhnaya
2019-02-28 21:22 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 20/20] cat-file: update docs Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 14/20] cat-file: move print_object_or_die to ref-filter Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 13/20] cat-file: rewrite print_object_or_die Olga Telezhnaya
2019-02-28 21:04 ` [PATCH RFC 01/20] cat-file: reuse struct ref_format Jeff King
2019-02-22 16:09 ` [PATCH RFC 0/20] cat-file: start using formatting logic from ref-filter Eric Sunshine
2019-02-22 16:19 ` Olga Telezhnaya
2019-02-28 21:41 ` Jeff King
2019-03-01 6:16 ` Olga Telezhnaya
2019-02-28 21:43 ` Jeff King
2019-03-01 6:17 ` Olga Telezhnaya
2019-03-03 1:21 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0102016915f49a5f-d96e159b-149d-40f9-9789-d0859dc7e2e9-000000@eu-west-1.amazonses.com \
--to=olyatelezhnaya@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).