Nguyễn Thái Ngọc Duy  <pclo...@gmail.com> writes:

> After the last patch, "result" and "backup" are the same. "result" used
> to move, but the movement is now contained in send_shallow(). Delete
> this redundant variable.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
> ---

OK.  05 and 06 squashed together would also have been readable, but
either way is fine; it is not worth merging them into one.

>  upload-pack.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/upload-pack.c b/upload-pack.c
> index 0eb9a0b..ee5d20b 100644
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -554,7 +554,7 @@ static void send_shallow(struct commit_list *result)
>  
>  static void deepen(int depth, const struct object_array *shallows)
>  {
> -     struct commit_list *result = NULL, *backup = NULL;
> +     struct commit_list *result = NULL;
>       int i;
>       if (depth == INFINITE_DEPTH && !is_repository_shallow())
>               for (i = 0; i < shallows->nr; i++) {
> @@ -562,11 +562,10 @@ static void deepen(int depth, const struct object_array 
> *shallows)
>                       object->flags |= NOT_SHALLOW;
>               }
>       else
> -             backup = result =
> -                     get_shallow_commits(&want_obj, depth,
> -                                         SHALLOW, NOT_SHALLOW);
> +             result = get_shallow_commits(&want_obj, depth,
> +                                          SHALLOW, NOT_SHALLOW);
>       send_shallow(result);
> -     free_commit_list(backup);
> +     free_commit_list(result);
>       for (i = 0; i < shallows->nr; i++) {
>               struct object *object = shallows->objects[i].item;
>               if (object->flags & NOT_SHALLOW) {
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to