From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, Kevin Ballard <kevin@sb.org>,
Yann Dirson <dirson@bertin.fr>, Jeff King <peff@peff.net>,
Jakub Narebski <jnareb@gmail.com>
Subject: Re: [PATCH 2/2] get_sha1: support ref^{/regex} syntax
Date: Wed, 08 Dec 2010 14:50:57 -0800 [thread overview]
Message-ID: <7vvd33j2um.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 1291820319-12455-3-git-send-email-pclouds@gmail.com
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> diff --git a/sha1_name.c b/sha1_name.c
> index f4ccdc5..00e52b0 100644
> --- a/sha1_name.c
> +++ b/sha1_name.c
> @@ -562,6 +563,11 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
> expected_type = OBJ_BLOB;
> else if (sp[0] == '}')
> expected_type = OBJ_NONE;
> + else if (sp[0] == '/') {
> + if (sp[1] == '}')
> + return -1;
Why? $commit^{/} may be a no-op but I do not see a strong reason to
waste extra two lines to forbid it.
> @@ -584,11 +590,23 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
> * barf.
> */
> o = peel_to_type(name, len, o, expected_type);
> - if (o) {
> - hashcpy(sha1, o->sha1);
> - return 0;
> + if (!o)
> + return -1;
I can see you are trying to reduce nesting of
if (o) {
do true thing
return 0
}
return -1;
but then we should apply the same to outer "if (!expected_type) ... else",
too, to unnest the "else" clause by returning from the true branch of that
"if".
next prev parent reply other threads:[~2010-12-08 22:51 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-08 14:58 [PATCH 0/2] [RFD] Using gitrevisions :/search style with other operators Nguyễn Thái Ngọc Duy
2010-12-08 14:58 ` [PATCH 1/2] get_sha1_oneline: allow to input commit_list Nguyễn Thái Ngọc Duy
2010-12-08 15:11 ` Thiago Farina
2010-12-08 14:58 ` [PATCH 2/2] get_sha1: support ref^{/regex} syntax Nguyễn Thái Ngọc Duy
2010-12-08 22:50 ` Junio C Hamano [this message]
2010-12-08 18:06 ` [PATCH 0/2] [RFD] Using gitrevisions :/search style with other operators Jonathan Nieder
2010-12-08 19:51 ` Jakub Narebski
2010-12-09 1:28 ` Nguyen Thai Ngoc Duy
2010-12-09 1:54 ` Jakub Narebski
2010-12-09 1:59 ` Jonathan Nieder
2010-12-09 2:02 ` Kevin Ballard
2010-12-09 2:06 ` Nguyen Thai Ngoc Duy
2010-12-09 2:11 ` Jonathan Nieder
2010-12-09 6:22 ` Junio C Hamano
2010-12-09 11:38 ` Jakub Narebski
2010-12-10 13:25 ` Nguyen Thai Ngoc Duy
2010-12-10 19:03 ` Jonathan Nieder
2010-12-10 19:26 ` Jakub Narebski
2010-12-10 21:21 ` Kevin Ballard
2010-12-10 21:30 ` Jeff King
2010-12-10 23:08 ` Junio C Hamano
2010-12-10 23:11 ` Kevin Ballard
2010-12-10 23:36 ` Junio C Hamano
2010-12-09 5:15 ` Junio C Hamano
2010-12-08 19:47 ` Jakub Narebski
2010-12-08 20:40 ` Jonathan Nieder
2010-12-09 0:30 ` Nguyen Thai Ngoc Duy
2010-12-09 0:44 ` Jakub Narebski
2010-12-09 1:42 ` Nguyen Thai Ngoc Duy
2010-12-09 1:46 ` Kevin Ballard
2010-12-09 11:43 ` Jakub Narebski
2010-12-09 11:53 ` Nguyen Thai Ngoc Duy
-- strict thread matches above, loose matches on Subject: below --
2010-12-12 10:56 [PATCH 1/2] get_sha1_oneline: allow to input commit_list Nguyễn Thái Ngọc Duy
2010-12-12 10:56 ` [PATCH 2/2] get_sha1: support ref^{/regex} syntax Nguyễn Thái Ngọc Duy
2010-12-12 17:38 ` Jonathan Nieder
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=7vvd33j2um.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=dirson@bertin.fr \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=kevin@sb.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).