Re: [PATCH v2] pull: handle --log=<n>

From: Paul Tan <pyokagan@gmail.com>
Date: May 18, 2015, 15:15 UTC
Message-ID: <CACRoPnQKge+3gCnO79yTZHxyPE=XgCONApWPF7Ue7DSxr0E7Og@mail.gmail.com>
In-Reply-To: <1431956396-21788-1-git-send-email-pyokagan@gmail.com>

Just a mental note to myself,

On Mon, May 18, 2015 at 9:39 PM, Paul Tan <pyokagan@gmail.com> wrote:

Show 19 quoted lines

> diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
> index 8cccecc..eebb8c9 100755
> --- a/t/t5524-pull-msg.sh
> +++ b/t/t5524-pull-msg.sh
> @@ -17,6 +17,9 @@ test_expect_success setup '
>                 git commit -m "add bfile"
>         ) &&
>         test_tick && test_tick &&
> +       echo "second" >afile &&
> +       git add afile &&
> +       git commit -m "second commit" &&
>         echo "original $dollar" >afile &&
>         git add afile &&
>         git commit -m "do not clobber $dollar signs"
> @@ -32,4 +35,18 @@ test_expect_success pull '
>  )
>  '
>
> +test_expect_failure '--log=1 limits shortlog length' '

Ugh ><

s/test_expect_failure/test_expect_success/

Will respond to the other reviews tomorrow (it's bedtime in SGT).

Show 16 quoted lines

> +(
> +       cd cloned &&
> +       git reset --hard HEAD^ &&
> +       test "$(cat afile)" = original &&
> +       test "$(cat bfile)" = added &&
> +       git pull --log=1 &&
> +       git log -3 &&
> +       git cat-file commit HEAD >result &&
> +       grep Dollar result &&
> +       ! grep "second commit" result
> +)
> +'
> +
>  test_done
> --
> 2.1.4

Thanks, Paul