From: Christian Couder Date: Wed, 12 Aug 2009 05:15:44 GMT Subject: [PATCH 06/13] pick: simplify "error(...)" followed by "return -1" Message-ID: <20090812051552.18155.1868.chriscool@tuxfamily.org> In-Reply-To: <20090812051116.18155.70541.chriscool@tuxfamily.org> into "return error(...)", as suggested by Junio. Signed-off-by: Christian Couder --- pick.c | 62 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 24 insertions(+), 38 deletions(-) diff --git a/pick.c b/pick.c index 77c7169..6fea39c 100644 --- a/pick.c +++ b/pick.c @@ -93,24 +93,18 @@ int pick(struct commit *pick_commit, int mainline, int flags, * that represents the "current" state for merge-recursive * to work on. */ - if (write_cache_as_tree(head, 0, NULL)) { - error("Your index file is unmerged."); - return -1; - } + if (write_cache_as_tree(head, 0, NULL)) + return error("Your index file is unmerged."); discard_cache(); index_fd = hold_locked_index(&index_lock, 0); - if (index_fd < 0) { - error("Unable to create locked index: %s", - strerror(errno)); - return -1; - } + if (index_fd < 0) + return error("Unable to create locked index: %s", + strerror(errno)); if (!commit->parents) { - if (flags & PICK_REVERSE) { - error("Cannot revert a root commit"); - return -1; - } + if (flags & PICK_REVERSE) + return error("Cannot revert a root commit"); parent = NULL; } else if (commit->parents->next) { @@ -118,40 +112,32 @@ int pick(struct commit *pick_commit, int mainline, int flags, int cnt; struct commit_list *p; - if (!mainline) { - error("Commit %s is a merge but no mainline was given.", - sha1_to_hex(commit->object.sha1)); - return -1; - } + if (!mainline) + return error("Commit %s is a merge but no mainline was given.", + sha1_to_hex(commit->object.sha1)); for (cnt = 1, p = commit->parents; cnt != mainline && p; cnt++) p = p->next; - if (cnt != mainline || !p) { - error("Commit %s does not have parent %d", - sha1_to_hex(commit->object.sha1), mainline); - return -1; - } + if (cnt != mainline || !p) + return error("Commit %s does not have parent %d", + sha1_to_hex(commit->object.sha1), + mainline); parent = p->item; - } else if (0 < mainline) { - error("Mainline was specified but commit %s is not a merge.", - sha1_to_hex(commit->object.sha1)); - return -1; - } else + } else if (0 < mainline) + return error("Mainline was specified but commit %s is not a merge.", + sha1_to_hex(commit->object.sha1)); + else parent = commit->parents->item; - if (!(message = commit->buffer)) { - error("Cannot get commit message for %s", - sha1_to_hex(commit->object.sha1)); - return -1; - } + if (!(message = commit->buffer)) + return error("Cannot get commit message for %s", + sha1_to_hex(commit->object.sha1)); - if (parent && parse_commit(parent) < 0) { - error("Cannot parse parent commit %s", - sha1_to_hex(parent->object.sha1)); - return -1; - } + if (parent && parse_commit(parent) < 0) + return error("Cannot parse parent commit %s", + sha1_to_hex(parent->object.sha1)); oneline = get_oneline(message); -- 1.6.4.271.ge010d