Re: [PATCH v3] git cherry-pick: Add NULL check to sequencer parsing of HEAD
- From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
- Date
- May 3, 2012, 16:48 UTC
- Message-ID
- <vpqtxzx5hxz.fsf@bauges.imag.fr>
- In-Reply-To
- <1336054159-5123-1-git-send-email-nhorman@tuxdriver.com>
Neil Horman <nhorman@tuxdriver.com> writes:
Show 6 quoted lines
> - if (!head_commit || parse_commit(head_commit))
> - return error(_("could not parse commit %s\n"),
> - sha1_to_hex(head_commit->object.sha1));
> +
> + if (parse_commit(head_commit))
> + return -1;Why did you replace the error("...") with only a -1? error() also returns -1, but displays a message before, which I think was fine. If you want to remove the message, then explain why in the commit message.
If you do not test for head_commit to be null, you can't use it in the error message. But from the context, it seems you can use head_sha1. If not, a message like "Could not parse HEAD commit" seems better than nothing.
-- Matthieu Moy http://www-verimag.imag.fr/~moy/