mirror of
https://github.com/git/git.git
synced 2024-09-25 19:10:59 +02:00
apply: code simplification
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:
parent
01aff0ae85
commit
45b625142d
12
apply.c
12
apply.c
@ -3780,11 +3780,15 @@ static int check_preimage(struct apply_state *state,
|
||||
}
|
||||
|
||||
if (!state->cached && !previous) {
|
||||
if (!trust_executable_bit)
|
||||
st_mode = (*ce && (*ce)->ce_mode)
|
||||
? (*ce)->ce_mode : patch->old_mode;
|
||||
else
|
||||
if (*ce && !(*ce)->ce_mode)
|
||||
BUG("ce_mode == 0 for path '%s'", old_name);
|
||||
|
||||
if (trust_executable_bit)
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user