Re: git cat-file -e behavior
- From
Jeff King <peff@peff.net>
- Date
- Feb 29, 2016, 12:40 UTC
- Message-ID
- <20160229124032.GA21158@sigill.intra.peff.net>
- In-Reply-To
- <20160229114455.GD29769@sigill.intra.peff.net>
On Mon, Feb 29, 2016 at 06:44:55AM -0500, Jeff King wrote:
Show 26 quoted lines
> [...]but it would be easy to change:
>
> diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> index 54db118..afde169 100644
> --- a/builtin/cat-file.c
> +++ b/builtin/cat-file.c
> @@ -35,6 +35,9 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
> if (unknown_type)
> flags |= LOOKUP_UNKNOWN_OBJECT;
>
> + if (opt == 'e')
> + return !has_sha1_file(sha1);
> +
> if (get_sha1_with_context(obj_name, 0, sha1, &obj_context))
> die("Not a valid object name %s", obj_name);
>
> @@ -58,9 +61,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
> printf("%lu\n", size);
> return 0;
>
> - case 'e':
> - return !has_sha1_file(sha1);
> -
> case 'c':
> if (!obj_context.path[0])
> die("git cat-file --textconv %s: <object> must be <sha1:path>",This is wrong, of course. We still need to call get_sha1, but just need to not die. So it's more like this (totally untested, naturally):
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 54db118..44add8c 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -35,8 +35,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, if (unknown_type) flags |= LOOKUP_UNKNOWN_OBJECT; - if (get_sha1_with_context(obj_name, 0, sha1, &obj_context)) + if (get_sha1_with_context(obj_name, 0, sha1, &obj_context)) { + if (opt == 'e') + return 1; die("Not a valid object name %s", obj_name); + } buf = NULL; switch (opt) { -Peff