From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <johannes.schindelin@gmx•de>
Cc: git@vger•kernel.org, "Torsten Bögershausen" <tboegi@web•de>,
"Jeff King" <peff@peff•net>
Subject: Re: [PATCH v2 0/4] cat-file: optionally convert to worktree version
Date: Wed, 24 Aug 2016 09:09:06 -0700 [thread overview]
Message-ID: <xmqqk2f6rvx9.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <cover.1472041389.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Wed, 24 Aug 2016 14:23:30 +0200 (CEST)")
Johannes Schindelin <johannes.schindelin@gmx•de> writes:
> diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> index 5f91cf4..f8a3a08 100644
> --- a/builtin/cat-file.c
> +++ b/builtin/cat-file.c
> @@ -61,6 +61,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;
> @@ -68,6 +69,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':
The above two hunks make all the difference in the ease of reading
the remainder of the function. Very good.
> +test_expect_success '----path=<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
> +'
This will need to become test_i18ngrep once the error message is
made translatable, but it is correct for now. I personally think
there is no need to check "actual" or "err", though---just running
cat-file under test_must_fail should be sufficient.
Thanks, will queue.
next prev parent reply other threads:[~2016-08-24 16:09 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 12:46 [PATCH 0/4] cat-file: optionally convert to worktree version Johannes Schindelin
2016-08-18 12:46 ` [PATCH 1/4] cat-file: fix a grammo in the man page Johannes Schindelin
2016-08-18 16:21 ` Junio C Hamano
2016-08-18 12:46 ` [PATCH 2/4] cat-file: introduce the --filters option Johannes Schindelin
2016-08-18 15:49 ` Torsten Bögershausen
2016-08-19 12:37 ` Johannes Schindelin
2016-08-19 16:06 ` Junio C Hamano
2016-08-18 16:37 ` Junio C Hamano
2016-08-19 12:49 ` Johannes Schindelin
2016-08-19 8:57 ` Torsten Bögershausen
2016-08-19 15:00 ` Johannes Schindelin
2016-08-19 16:06 ` Junio C Hamano
2016-08-22 16:51 ` Torsten Bögershausen
2016-08-24 8:00 ` Johannes Schindelin
2016-08-18 12:46 ` [PATCH 3/4] cat-file --textconv/--filters: allow specifying the path separately Johannes Schindelin
2016-08-18 16:52 ` Junio C Hamano
2016-08-19 14:49 ` Johannes Schindelin
2016-08-19 16:11 ` Junio C Hamano
2016-08-24 7:57 ` Johannes Schindelin
2016-08-18 12:46 ` [PATCH 4/4] cat-file: support --textconv/--filters in batch mode Johannes Schindelin
2016-08-18 15:42 ` Torsten Bögershausen
2016-08-19 12:25 ` Johannes Schindelin
2016-08-19 15:06 ` Jeff King
2016-08-19 16:19 ` Junio C Hamano
2016-08-18 17:08 ` Junio C Hamano
2016-08-19 12:59 ` Johannes Schindelin
2016-08-19 14:44 ` Jeff King
2016-08-18 22:05 ` Jeff King
2016-08-18 22:47 ` Junio C Hamano
2016-08-19 13:11 ` Johannes Schindelin
2016-08-19 13:09 ` Johannes Schindelin
2016-08-19 13:22 ` Jeff King
2016-08-24 12:23 ` [PATCH v2 0/4] cat-file: optionally convert to worktree version Johannes Schindelin
2016-08-24 12:23 ` [PATCH v2 1/4] cat-file: fix a grammo in the man page Johannes Schindelin
2016-08-24 12:23 ` [PATCH v2 2/4] cat-file: introduce the --filters option Johannes Schindelin
2016-08-24 17:46 ` Junio C Hamano
2016-08-24 17:52 ` Junio C Hamano
2016-08-31 20:31 ` Johannes Schindelin
2016-08-31 20:53 ` Junio C Hamano
2016-08-24 12:23 ` [PATCH v2 3/4] cat-file --textconv/--filters: allow specifying the path separately Johannes Schindelin
2016-08-24 17:49 ` Junio C Hamano
2016-08-24 18:25 ` Junio C Hamano
2016-08-31 19:49 ` Johannes Schindelin
2016-08-31 20:17 ` Junio C Hamano
2016-08-24 12:23 ` [PATCH v2 4/4] cat-file: support --textconv/--filters in batch mode Johannes Schindelin
2016-08-24 16:09 ` Junio C Hamano [this message]
2016-08-24 16:19 ` [PATCH v2 0/4] cat-file: optionally convert to worktree version Jeff King
2016-08-24 17:02 ` Junio C Hamano
2016-08-24 17:32 ` Jeff King
2016-08-24 17:55 ` Junio C Hamano
2016-08-29 21:02 ` Junio C Hamano
2016-08-31 20:34 ` Johannes Schindelin
2016-09-09 10:10 ` [PATCH v3 " Johannes Schindelin
2016-09-09 10:10 ` [PATCH v3 1/4] cat-file: fix a grammo in the man page Johannes Schindelin
2016-09-09 10:10 ` [PATCH v3 2/4] cat-file: introduce the --filters option Johannes Schindelin
2016-09-09 15:09 ` Junio C Hamano
2016-09-09 16:01 ` Johannes Schindelin
2016-09-09 16:08 ` Junio C Hamano
2016-09-09 17:16 ` Junio C Hamano
2016-09-09 17:26 ` Junio C Hamano
2016-09-10 7:57 ` Johannes Schindelin
2016-09-11 21:44 ` Junio C Hamano
2016-09-09 10:10 ` [PATCH v3 3/4] cat-file --textconv/--filters: allow specifying the path separately Johannes Schindelin
2016-09-09 18:06 ` Junio C Hamano
2016-09-10 7:59 ` Johannes Schindelin
2016-09-09 10:10 ` [PATCH v3 4/4] cat-file: support --textconv/--filters in batch mode Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk2f6rvx9.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=peff@peff$(echo .)net \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox