From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Stephen Boyd <sboyd@codeaurora.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges
Date: Mon, 03 Jun 2013 01:47:38 +0200 [thread overview]
Message-ID: <51ABD99A.2030303@lsrfire.ath.cx> (raw)
In-Reply-To: <CAMP44s2+Hx-6E7DkmWL_m92jDt5-Cj8FGHpACBZcqp1sn5Tfzw@mail.gmail.com>
Am 03.06.2013 01:23, schrieb Felipe Contreras:
> I didn't say we should do 'if (ce) free(ce);' instead of 'free(ce);' I
> said we should do 'if (cd && ce != o->df_conflict_entry)' instead of
> 'if (ce != o->df_conflict_entry)'.
I did assume you meant the latter.
> There's no reason not to.
Only the minor ones already mentioned: More text, one more branch in
object code, no benefit except for some hypothetical future case that's
caught by the test suite anyway -- or by code review.
I wonder if we already reached the point where we spent more time
discussing this change than the time needed by the envisioned developer
to find and fix the NULL check that suddenly became necessary. :)
René
next prev parent reply other threads:[~2013-06-02 23:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-02 15:46 [PATCH v2 0/7] unpack-trees: plug memory leak for merges René Scharfe
2013-06-02 15:46 ` [PATCH v2 1/7] cache: mark cache_entry pointers const René Scharfe
2013-06-02 15:46 ` [PATCH v2 2/7] read-cache: " René Scharfe
2013-06-02 15:46 ` [PATCH v2 3/7] unpack-trees: factor out dup_entry René Scharfe
2013-06-02 15:46 ` [PATCH v2 4/7] unpack-trees: create working copy of merge entry in merged_entry René Scharfe
2013-06-02 15:46 ` [PATCH v2 5/7] diff-lib, read-tree, unpack-trees: mark cache_entry pointers const René Scharfe
2013-06-02 15:46 ` [PATCH v2 6/7] diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const René Scharfe
2013-06-02 15:46 ` [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges René Scharfe
2013-06-02 17:25 ` Felipe Contreras
2013-06-02 17:54 ` René Scharfe
2013-06-02 17:59 ` Felipe Contreras
2013-06-02 20:26 ` René Scharfe
2013-06-02 22:38 ` Felipe Contreras
2013-06-02 23:06 ` René Scharfe
2013-06-02 23:23 ` Felipe Contreras
2013-06-02 23:47 ` René Scharfe [this message]
2013-06-03 0:04 ` Felipe Contreras
2013-06-03 15:59 ` René Scharfe
2013-06-03 16:10 ` Felipe Contreras
2013-06-03 16:57 ` [PATCH v2 8/7] unpack-trees: document that pointer ce can be NULL René Scharfe
2013-06-03 17:40 ` [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges Junio C Hamano
2013-06-03 20:53 ` Felipe Contreras
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=51ABD99A.2030303@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sboyd@codeaurora.org \
/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.
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 NNTP newsgroup(s).