diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-21 01:26:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-21 01:26:59 +0300 |
| commit | 538dc459a0331c48b893c9f6ca0be5917860bb99 (patch) | |
| tree | d8b7cf10c62573f767116c14f7ffd0d9e1d8ec32 /builtin/checkout.c | |
| parent | acdeb10f91da939135fbacb847792ae237450d7d (diff) | |
| parent | 72a4ea71e5f29e4078363e87e4471128ff713a62 (diff) | |
Merge branch 'ep/maint-equals-null-cocci'
Introduce and apply coccinelle rule to discourage an explicit
comparison between a pointer and NULL, and applies the clean-up to
the maintenance track.
* ep/maint-equals-null-cocci:
tree-wide: apply equals-null.cocci
tree-wide: apply equals-null.cocci
contrib/coccinnelle: add equals-null.cocci
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 797681481d..f988936ddf 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -834,7 +834,7 @@ static int merge_working_tree(const struct checkout_opts *opts, if (ret) return ret; o.ancestor = old_branch_info->name; - if (old_branch_info->name == NULL) { + if (!old_branch_info->name) { strbuf_add_unique_abbrev(&old_commit_shortname, &old_branch_info->commit->object.oid, DEFAULT_ABBREV); |