]> git.ipfire.org Git - thirdparty/git.git/commitdiff
reset: rename is_missing to !is_in_reset_tree
authorVictoria Dye <vdye@github.com>
Thu, 7 Oct 2021 21:15:31 +0000 (21:15 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Oct 2021 01:00:31 +0000 (18:00 -0700)
Rename and invert value of `is_missing` to `is_in_reset_tree` to make the
variable more descriptive of what it represents.

Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/reset.c

index 51c9e2f43ff73734ab61b12fa3ef428485dfe003..d3695ce43c47a6461ff74459e0d09bcce7813952 100644 (file)
@@ -131,10 +131,10 @@ static void update_index_from_diff(struct diff_queue_struct *q,
 
        for (i = 0; i < q->nr; i++) {
                struct diff_filespec *one = q->queue[i]->one;
-               int is_missing = !(one->mode && !is_null_oid(&one->oid));
+               int is_in_reset_tree = one->mode && !is_null_oid(&one->oid);
                struct cache_entry *ce;
 
-               if (is_missing && !intent_to_add) {
+               if (!is_in_reset_tree && !intent_to_add) {
                        remove_file_from_cache(one->path);
                        continue;
                }
@@ -144,7 +144,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
                if (!ce)
                        die(_("make_cache_entry failed for path '%s'"),
                            one->path);
-               if (is_missing) {
+               if (!is_in_reset_tree) {
                        ce->ce_flags |= CE_INTENT_TO_ADD;
                        set_object_name_for_intent_to_add_entry(ce);
                }