mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply: code simplification

Browse Source 
Rewrite a bit hard-to-read ternary ?: expression into a cascade of
if/else.

Given that read-cache.c:add_index_entry() makes sure that the
.ce_mode member is filled with a reasonable value before placing a
cache entry in the index, if we see (ce_mode == 0), there is
something seriously wrong going on.  Catch such a bug and abort,
instead of silently ignoring such an entry and silently skipping
the check.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2023-12-26 15:32:18 -08:00
parent 01aff0ae85
commit 45b625142d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apply.c
View File

@ -3780,11 +3780,15 @@ static int check_preimage(struct apply_state *state,
} }
if (!state->cached && !previous) { if (!state->cached && !previous) {
if (!trust_executable_bit) if (*ce && !(*ce)->ce_mode)
st_mode = (*ce && (*ce)->ce_mode) BUG("ce_mode == 0 for path '%s'", old_name);
? (*ce)->ce_mode : patch->old_mode;
else if (trust_executable_bit)
st_mode = ce_mode_from_stat(*ce, st->st_mode); st_mode = ce_mode_from_stat(*ce, st->st_mode);
else if (*ce)
st_mode = (*ce)->ce_mode;
else
st_mode = patch->old_mode;
} }
if (patch->is_new < 0) if (patch->is_new < 0)