threads / patch / 36018

v3write_pack_file: use correct variable in diagnostic

Subject: [PATCH v3] write_pack_file: use correct variable in diagnostic

## tl;dr

4 messages between Mar 2, 2014 and Mar 3, 2014. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Sun He· Mar 2, 2014, 07:30 UTC · lore

'pack_tmp_name' is the subject of the utime() check, so report it in the warning, not the uninitialized 'tmpname'

Signed-off-by: Sun He <sunheehnus@gmail.com>
---
 Changing the subject and adding valid information as tutored by 
 Eric Sunshine.
 Thanks to him.
 builtin/pack-objects.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to builtin/pack-objects.c +1 −1
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c733379..4922ce5 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -823,7 +823,7 @@ static void write_pack_file(void)
 				utb.modtime = --last_mtime;
 				if (utime(pack_tmp_name, &utb) < 0)
 					warning("failed utime() on %s: %s",
-						tmpname, strerror(errno));
+						pack_tmp_name, strerror(errno));
 			}
 
 			/* Enough space for "-<sha-1>.pack"? */
-- 
1.9.0.138.g2de3478.dirty
Eric Sunshine· Mar 2, 2014, 18:42 UTC · re: Sun He · lore

Re: [PATCH v3] write_pack_file: use correct variable in diagnostic

On Sun, Mar 2, 2014 at 2:30 AM, Sun He <sunheehnus@gmail.com> wrote:
Show 28 quoted lines
> 'pack_tmp_name' is the subject of the utime() check, so report it in the
> warning, not the uninitialized 'tmpname'
>
> Signed-off-by: Sun He <sunheehnus@gmail.com>
> ---
>
>  Changing the subject and adding valid information as tutored by
>  Eric Sunshine.
>  Thanks to him.
>
>  builtin/pack-objects.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index c733379..4922ce5 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -823,7 +823,7 @@ static void write_pack_file(void)
>                                 utb.modtime = --last_mtime;
>                                 if (utime(pack_tmp_name, &utb) < 0)
>                                         warning("failed utime() on %s: %s",
> -                                               tmpname, strerror(errno));
> +                                               pack_tmp_name, strerror(errno));
>                         }
>
>                         /* Enough space for "-<sha-1>.pack"? */
> --
> 1.9.0.138.g2de3478.dirty
Nicely done. Everything is where it ought to be.
As this is an actual bug fix (not just a GSoC microproject):
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
He Sun· Mar 3, 2014, 01:20 UTC · re: Eric Sunshine · lore

Re: [PATCH v3] write_pack_file: use correct variable in diagnostic

2014-03-03 2:42 GMT+08:00 Eric Sunshine <sunshine@sunshineco.com>:
Show 35 quoted lines
> On Sun, Mar 2, 2014 at 2:30 AM, Sun He <sunheehnus@gmail.com> wrote:
>> 'pack_tmp_name' is the subject of the utime() check, so report it in the
>> warning, not the uninitialized 'tmpname'
>>
>> Signed-off-by: Sun He <sunheehnus@gmail.com>
>> ---
>>
>>  Changing the subject and adding valid information as tutored by
>>  Eric Sunshine.
>>  Thanks to him.
>>
>>  builtin/pack-objects.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
>> index c733379..4922ce5 100644
>> --- a/builtin/pack-objects.c
>> +++ b/builtin/pack-objects.c
>> @@ -823,7 +823,7 @@ static void write_pack_file(void)
>>                                 utb.modtime = --last_mtime;
>>                                 if (utime(pack_tmp_name, &utb) < 0)
>>                                         warning("failed utime() on %s: %s",
>> -                                               tmpname, strerror(errno));
>> +                                               pack_tmp_name, strerror(errno));
>>                         }
>>
>>                         /* Enough space for "-<sha-1>.pack"? */
>> --
>> 1.9.0.138.g2de3478.dirty
>
> Nicely done. Everything is where it ought to be.
>
> As this is an actual bug fix (not just a GSoC microproject):
>
> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>

Thank you so much for everything you have done. I am honored to do this with all your support and kindness.

Regards, He Sun

Junio C Hamano· Mar 3, 2014, 18:43 UTC · re: Sun He · lore

Re: [PATCH v3] write_pack_file: use correct variable in diagnostic

Sun He <sunheehnus@gmail.com> writes:
Show 26 quoted lines
> 'pack_tmp_name' is the subject of the utime() check, so report it in the
> warning, not the uninitialized 'tmpname'
>
> Signed-off-by: Sun He <sunheehnus@gmail.com>
> ---
>
>  Changing the subject and adding valid information as tutored by 
>  Eric Sunshine.
>  Thanks to him.
>
>  builtin/pack-objects.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index c733379..4922ce5 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -823,7 +823,7 @@ static void write_pack_file(void)
>  				utb.modtime = --last_mtime;
>  				if (utime(pack_tmp_name, &utb) < 0)
>  					warning("failed utime() on %s: %s",
> -						tmpname, strerror(errno));
> +						pack_tmp_name, strerror(errno));
>  			}
>  
>  			/* Enough space for "-<sha-1>.pack"? */
Very nicely done.  Thanks.
And big Thanks to Eric guiding this patch through.

← back to recent threads