diff mbox series

[v4,02/34] builtin rebase: use oideq()

Message ID	20190416093341.17079-3-pclouds@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> To: pclouds@gmail.com Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org, gitster@pobox.com, stefanbeller@gmail.com, szeder.dev@gmail.com Subject: [PATCH v4 02/34] builtin rebase: use oideq() Date: Tue, 16 Apr 2019 16:33:09 +0700 Message-Id: <20190416093341.17079-3-pclouds@gmail.com> In-Reply-To: <20190416093341.17079-1-pclouds@gmail.com> References: <20190406113453.5149-1-pclouds@gmail.com> <20190416093341.17079-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	[v4,01/34] builtin rebase: use FREE_AND_NULL \| expand [v4,01/34] builtin rebase: use FREE_AND_NULL [v4,02/34] builtin rebase: use oideq() [v4,03/34] packfile.c: add repo_approximate_object_count() [v4,04/34] refs.c: add refs_ref_exists() [v4,05/34] refs.c: add refs_shorten_unambiguous_ref() [v4,06/34] refs.c: remove the_repo from substitute_branch_name() [v4,07/34] refs.c: remove the_repo from expand_ref() [v4,08/34] refs.c: add repo_dwim_ref() [v4,09/34] refs.c: add repo_dwim_log() [v4,10/34] refs.c: remove the_repo from read_ref_at() [v4,11/34] commit.cocci: refactor code, avoid double rewrite [v4,12/34] commit.c: add repo_get_commit_tree() [v4,13/34] sha1-name.c: remove the_repo from sort_ambiguous() [v4,14/34] sha1-name.c: remove the_repo from find_abbrev_len_packed() [v4,15/34] sha1-name.c: add repo_find_unique_abbrev_r() [v4,16/34] sha1-name.c: store and use repo in struct disambiguate_state [v4,17/34] sha1-name.c: add repo_for_each_abbrev() [v4,18/34] sha1-name.c: remove the_repo from get_short_oid() [v4,19/34] sha1-name.c: remove the_repo from interpret_nth_prior_checkout() [v4,20/34] sha1-name.c: remove the_repo from interpret_branch_mark() [v4,21/34] sha1-name.c: add repo_interpret_branch_name() [v4,22/34] sha1-name.c: remove the_repo from get_oid_oneline() [v4,23/34] sha1-name.c: remove the_repo from get_describe_name() [v4,24/34] sha1-name.c: remove the_repo from get_oid_basic() [v4,25/34] sha1-name.c: remove the_repo from get_oid_1() [v4,26/34] sha1-name.c: remove the_repo from handle_one_ref() [v4,27/34] sha1-name.c: remove the_repo from diagnose_invalid_index_path() [v4,28/34] sha1-name.c: remove the_repo from resolve_relative_path() [v4,29/34] sha1-name.c: remove the_repo from get_oid_with_context_1() [v4,30/34] sha1-name.c: add repo_get_oid() [v4,31/34] submodule-config.c: use repo_get_oid for reading .gitmodules [v4,32/34] sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name [v4,33/34] sha1-name.c: remove the_repo from other get_oid_* [v4,34/34] sha1-name.c: remove the_repo from get_oid_mb()

Commit Message

Duy Nguyen April 16, 2019, 9:33 a.m. UTC

From: SZEDER Gábor <szeder.dev@gmail.com>

Use oideq() instead of !oidcmp(), as it is more idiomatic, and might
give the compiler more opportunities to optimize.

Patch generated with 'contrib/coccinelle/free.cocci' and Coccinelle
v1.0.7 (previous Coccinelle versions don't notice this).

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 868bcd1446..c064909329 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1792,7 +1792,7 @@  int cmd_rebase(int argc, const char **argv, const char *prefix)
 	 * we just fast-forwarded.
 	 */
 	strbuf_reset(&msg);
-	if (!oidcmp(&merge_base, &options.orig_head)) {
+	if (oideq(&merge_base, &options.orig_head)) {
 		printf(_("Fast-forwarded %s to %s.\n"),
 			branch_name, options.onto_name);
 		strbuf_addf(&msg, "rebase finished: %s onto %s",