diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-02 10:06:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-02 10:06:04 -0700 |
| commit | 2b0a58d164b0642be3eeb476fecd28114445cdd5 (patch) | |
| tree | 2759549fcdd5d3ce4c9776f67937b4b75c07070f /builtin/checkout.c | |
| parent | d516b2db0af2221bd6b13e7347abdcb5830b2829 (diff) | |
| parent | afe8a9070bc62db9cfde1e30147178c40d391d93 (diff) | |
| download | git-2b0a58d164b0642be3eeb476fecd28114445cdd5.tar.gz | |
Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
* ep/maint-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 cc804ba8e1..300766e590 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -822,7 +822,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); |