From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <johannes.schindelin@gmx•de>
Cc: Tobias Klauser <tklauser@distanz•ch>, git@vger•kernel.org
Subject: Re: [PATCH] pretend_sha1_file(): Change return type from int to void
Date: Wed, 07 Oct 2015 14:22:59 -0700 [thread overview]
Message-ID: <xmqqa8rutlu4.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <ef5b20ed42ea20b2891fc3998a81f339@dscho.org> (Johannes Schindelin's message of "Tue, 06 Oct 2015 16:30:36 +0200")
Johannes Schindelin <johannes.schindelin@gmx•de> writes:
> As to the patch, I cannot speak for Junio, of course, but my
> preference would be to keep the return type. Traditionally, functions
> that can fail either die() or return an int; non-zero indicates an
> error. In this case, it seems that we do not have any condition
> (yet...) under which an error could occur. It does not seem very
> unlikely that we may eventually have such conditions, though, hence my
> preference.
Perhaps the attached is a better approach.
Even though the current implementation of "pretend" implementation
does not, future generations are allowed to make pretend_sha1_file()
return failure when appropriate.
builtin/blame.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index 203a981..fa24f8f 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2362,7 +2362,8 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
convert_to_git(path, buf.buf, buf.len, &buf, 0);
origin->file.ptr = buf.buf;
origin->file.size = buf.len;
- pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);
+ if (pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1))
+ die("failed to create a fake commit for the working tree version.");
/*
* Read the current index, replace the path entry with
next prev parent reply other threads:[~2015-10-07 21:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-06 12:15 [PATCH] pretend_sha1_file(): Change return type from int to void Tobias Klauser
2015-10-06 13:16 ` Johannes Schindelin
2015-10-06 13:51 ` Tobias Klauser
2015-10-06 14:30 ` Johannes Schindelin
2015-10-07 8:13 ` Tobias Klauser
2015-10-07 17:36 ` Junio C Hamano
2015-10-07 20:42 ` Stefan Beller
2015-10-07 21:14 ` Junio C Hamano
2015-10-07 21:24 ` Stefan Beller
2015-10-07 21:29 ` Junio C Hamano
2015-10-07 21:22 ` Junio C Hamano [this message]
2015-10-08 7:45 ` Tobias Klauser
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=xmqqa8rutlu4.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=tklauser@distanz$(echo .)ch \
/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