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>
Victoria Dye committed
Oct 7, 2021 at 21:15 UTC
1f86b7cb6396ea5f8cd612041938e7d3280e4002
1 file changed
+3
-3
builtin/reset.c
+3
-3
@@ -131,10 +131,10 @@ static void update_index_from_diff(struct diff_queue_struct *q,
131
132
for (i = 0; i < q->nr; i++) {
133
struct diff_filespec *one = q->queue[i]->one;
134
- int is_missing = !(one->mode && !is_null_oid(&one->oid));
134
+ int is_in_reset_tree = one->mode && !is_null_oid(&one->oid);
135
struct cache_entry *ce;
136
137
- if (is_missing && !intent_to_add) {
137
+ if (!is_in_reset_tree && !intent_to_add) {
138
remove_file_from_cache(one->path);
139
continue;
140
}
@@ -144,7 +144,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
144
if (!ce)
145
die(_("make_cache_entry failed for path '%s'"),
146
one->path);
147
- if (is_missing) {
147
+ if (!is_in_reset_tree) {
148
ce->ce_flags |= CE_INTENT_TO_ADD;
149
set_object_name_for_intent_to_add_entry(ce);
150
}