From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 4C09D2018E for ; Wed, 24 Aug 2016 12:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755106AbcHXMYg (ORCPT ); Wed, 24 Aug 2016 08:24:36 -0400 Received: from mout.gmx.net ([212.227.15.19]:60478 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754773AbcHXMX7 (ORCPT ); Wed, 24 Aug 2016 08:23:59 -0400 Received: from virtualbox ([37.24.141.250]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0MO7im-1bX1Rb42bs-005aph; Wed, 24 Aug 2016 14:23:44 +0200 Date: Wed, 24 Aug 2016 14:23:43 +0200 (CEST) From: Johannes Schindelin X-X-Sender: virtualbox@virtualbox To: git@vger.kernel.org cc: Junio C Hamano , =?UTF-8?Q?Torsten_B=C3=B6gershausen?= , Jeff King Subject: [PATCH v2 3/4] cat-file --textconv/--filters: allow specifying the path separately In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K0:ymE6/7NuZNZq61j6zvPU8OBaB2iWHuDAbY4qZhf9R3jm/LFG1iW SxY0xzV2FG53wAKQGMWHA9/60+AW2kaM7/zdWoIaD6XGMngoIe4p271pwA+HWYeV13W5+dC zuW5YOttKtzZcXmd13+90r9KTj6Oiom2u7n4+W0Ga9l2mL5ayUtqa43fUW3s+LfZpY7kyLe fnRK1kuB16c4MfqjAatrQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:Qr/RK9fN22I=:cOgPRFQR0TEY2hiZcnBQ4s N+OCmR4mlewU1SAtSYJZxkoVIktPTeDSlbPAOWfWpAMMy/cHbfw49QKj5hNBQSjP3gL5D6ytk +8XYHt1cLzfokMBuL+ZpriDsb6xGdqtjguBGO7bzyBNG7DlvzKP8SyRJwFq+tRxV10/TpJuzh RaRuxuYCjzc+TFu+m5ebuFxPBslnkGIav6LOK4bfxADBgWH4YSz208GV9toEQ1SpnCvm5sShN PVJyYMKVckVOvedR89G0Yz1TLvxjq1AkCjQpm/zUR9CDqQMooJ+yHexkMgkJezioFBXxw0OMr DVwOIjAg0VAGILThAwQP8maP0VNhRgZnECF9xtF4N146IDP8/hoVK6Gl1NeFv4MyBo43Yx9Q2 Xg6BffF/QBFHir0IigmEh1kF8y9I1omKFOl+Ys7aNngH5Jgav9Jpj63HWQtphi+y25KXF5tVf vuowU8nhBTuzP1mY3+zG1MhT270CWmqtJv1cfG6G1J+PTiP3HXEqwuZ/ACZu86tEjYUClYJ06 PN2anIO4Bso34CD7U5BKy7+YnfRnPJ/26isYubs3b9tqSFFcloxrX1yWeAomz99zcIiDMRQfn aOHqIrpVl6z91vOo+RwRG4iL07FGfgidjBs2/DNHeELkt772lIdNL4jw5bR4rXGPAqOXTzqod 23R2m9L/6TlpwIFhVfzMSVPIny/NeXORQOmDZmDvfLPPd1zwjN8jzvGolRrJSQcWYHJ0pk9qw 3XY4VCqedOfB5w0twBdPYv7wzZeCdwSTg9KPxLJCVMgEXB0tvIYz55cuCE2y/SOccKX/XVYWZ 7e/dRaW Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There are circumstances when it is relatively easy to figure out the object name for a given path, but not the name of the containing tree. For example, when looking at a diff generated by Git, the object names are recorded, but not the revision. As a matter of fact, the revisions from which the diff was generated may not even exist locally. In such a case, the user would have to generate a fake revision just to be able to use --textconv or --filters. Let's simplify this dramatically, because we do not really need that revision at all: all we care about is that we know the path. In the scenario described above, we do know the path, and we just want to specify it separately from the object name. Example usage: git cat-file --textconv --path=main.c 0f1937fd Signed-off-by: Johannes Schindelin --- Documentation/git-cat-file.txt | 7 ++++++- builtin/cat-file.c | 26 +++++++++++++++++++++----- t/t8010-cat-file-filters.sh | 20 ++++++++++++++++++++ 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 537d02c..4fa9041 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -9,7 +9,7 @@ git-cat-file - Provide content or type and size information for repository objec SYNOPSIS -------- [verse] -'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | | --textconv | --filters ) +'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | | --textconv | --filters ) [--path=] 'git cat-file' (--batch | --batch-check) [--follow-symlinks] DESCRIPTION @@ -64,6 +64,11 @@ OPTIONS end-of-line conversion, etc). In this case, has to be of the form :, or :. +--path=:: + For use with --textconv or --filters, to allow specifying an object + name and a path separately, e.g. when it is difficult to figure out + the revision from which the blob came. + --batch:: --batch=:: Print object information and contents for each object provided diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 0b74afa..2c799ac 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -20,6 +20,8 @@ struct batch_options { const char *format; }; +static const char *force_path; + static int filter_object(const char *path, unsigned mode, const unsigned char *sha1, char **buf, unsigned long *size) @@ -58,6 +60,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, struct object_info oi = {NULL}; struct strbuf sb = STRBUF_INIT; unsigned flags = LOOKUP_REPLACE_OBJECT; + const char *path = force_path; if (unknown_type) flags |= LOOKUP_UNKNOWN_OBJECT; @@ -65,6 +68,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, if (get_sha1_with_context(obj_name, 0, sha1, &obj_context)) die("Not a valid object name %s", obj_name); + if (!path) + path = obj_context.path; + else if (obj_context.mode == S_IFINVALID) + obj_context.mode = 0100644; + buf = NULL; switch (opt) { case 't': @@ -89,21 +97,22 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, return !has_sha1_file(sha1); case 'w': - if (!obj_context.path[0]) + if (!path[0]) die("git cat-file --filters %s: must be " "", obj_name); - if (filter_object(obj_context.path, obj_context.mode, + if (filter_object(path, obj_context.mode, sha1, &buf, &size)) return -1; break; case 'c': - if (!obj_context.path[0]) + if (!path[0]) die("git cat-file --textconv %s: must be ", obj_name); - if (textconv_object(obj_context.path, obj_context.mode, sha1, 1, &buf, &size)) + if (textconv_object(path, obj_context.mode, + sha1, 1, &buf, &size)) break; case 'p': @@ -477,7 +486,7 @@ static int batch_objects(struct batch_options *opt) } static const char * const cat_file_usage[] = { - N_("git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p||--textconv|--filters) "), + N_("git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p||--textconv|--filters) [--path=] "), N_("git cat-file (--batch | --batch-check) [--follow-symlinks]"), NULL }; @@ -525,6 +534,8 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) N_("for blob objects, run textconv on object's content"), 'c'), OPT_CMDMODE(0, "filters", &opt, N_("for blob objects, run filters on object's content"), 'w'), + OPT_STRING(0, "path", &force_path, N_("blob"), + N_("use a specific path for --textconv/--filters")), OPT_BOOL(0, "allow-unknown-type", &unknown_type, N_("allow -s and -t to work with broken/corrupt objects")), OPT_BOOL(0, "buffer", &batch.buffer_output, N_("buffer --batch output")), @@ -567,6 +578,11 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) usage_with_options(cat_file_usage, options); } + if (force_path && opt != 'c' && opt != 'w') { + error("--path= needs --textconv or --filters"); + usage_with_options(cat_file_usage, options); + } + if (batch.buffer_output < 0) batch.buffer_output = batch.all_objects; diff --git a/t/t8010-cat-file-filters.sh b/t/t8010-cat-file-filters.sh index e466634..0d5c33e 100755 --- a/t/t8010-cat-file-filters.sh +++ b/t/t8010-cat-file-filters.sh @@ -31,4 +31,24 @@ test_expect_success 'cat-file --filters converts to worktree version' ' has_cr actual ' +test_expect_success 'cat-file --filters --path= works' ' + sha1=$(git rev-parse -q --verify HEAD:world.txt) && + git cat-file --filters --path=world.txt $sha1 >actual && + has_cr actual +' + +test_expect_success 'cat-file --textconv --path= works' ' + sha1=$(git rev-parse -q --verify HEAD:world.txt) && + test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" && + git cat-file --textconv --path=hello.txt $sha1 >rot13 && + test uryyb = "$(cat rot13 | remove_cr)" +' + +test_expect_success '----path= complains without --textconv/--filters' ' + sha1=$(git rev-parse -q --verify HEAD:world.txt) && + test_must_fail git cat-file --path=hello.txt blob $sha1 >actual 2>err && + test ! -s actual && + grep "path.*needs.*filters" err +' + test_done -- 2.10.0.rc1.99.gcd66998