threads / patch / 16666

patchremove unnecessary 'if'

Subject: [PATCH] remove unnecessary 'if'

## tl;dr

2 messages between Dec 10, 2008 and Dec 14, 2008. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Alexander Potashev· Dec 10, 2008, 14:09 UTC · lore

'patch->is_new' is always <= 0 at this point (look at 'assert' at the beginning of the function). In both cases ('is_new < 0' and 'is_new == 0') the result of those two lines is zeroing of 'is_new'.

Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
---
 builtin-apply.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Show changes to builtin-apply.c +1 −2

diff --git a/builtin-apply.c b/builtin-apply.c
index 4c4d1e1..904a748 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2440,8 +2440,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
 	if (!cached)
 		st_mode = ce_mode_from_stat(*ce, st->st_mode);
 
-	if (patch->is_new < 0)
-		patch->is_new = 0;
+	patch->is_new = 0;
 	if (!patch->old_mode)
 		patch->old_mode = st_mode;
 	if ((st_mode ^ patch->old_mode) & S_IFMT)

-- 
1.6.0.4

Alexander Potashev· Dec 14, 2008, 16:21 UTC · re: Alexander Potashev · lore

Re: [PATCH] remove unnecessary 'if'

Hello all!

What happened with this patch? Is it wrong or breaks comprehensibility?

On 17:09 Wed 10 Dec     , Alexander Potashev wrote:

Show 26 quoted lines

> 'patch->is_new' is always <= 0 at this point (look at 'assert' at the
> beginning of the function). In both cases ('is_new < 0' and 'is_new == 0')
> the result of those two lines is zeroing of 'is_new'.
> 
> Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
> ---
>  builtin-apply.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/builtin-apply.c b/builtin-apply.c
> index 4c4d1e1..904a748 100644
> --- a/builtin-apply.c
> +++ b/builtin-apply.c
> @@ -2440,8 +2440,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
>  	if (!cached)
>  		st_mode = ce_mode_from_stat(*ce, st->st_mode);
>  
> -	if (patch->is_new < 0)
> -		patch->is_new = 0;
> +	patch->is_new = 0;
>  	if (!patch->old_mode)
>  		patch->old_mode = st_mode;
>  	if ((st_mode ^ patch->old_mode) & S_IFMT)
> -- 
> 1.6.0.4
>

					Alexander