undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reset: rename is_missing to !is_in_reset_tree

Browse Source 
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>
This commit is contained in:
Victoria Dye 2021-10-07 21:15:31 +00:00 committed by Junio C Hamano
parent 106298f7f9
commit 1f86b7cb63
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/reset.c
View 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);
}