From: Victoria Dye <vdye@github.com>
Date: Thu, 7 Oct 2021 21:15:31 +0000 (+0000)
Subject: reset: rename is_missing to !is_in_reset_tree
X-Git-Tag: v2.35.0-rc0~105^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f86b7cb6396ea5f8cd612041938e7d3280e4002;p=thirdparty%2Fgit.git

reset: rename is_missing to !is_in_reset_tree

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>
---

diff --git a/builtin/reset.c b/builtin/reset.c
index 51c9e2f43f..d3695ce43c 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -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);
 		}