Re: [PATCH v3 4/5] t4202-log: add tests for --merges=

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Apr 13, 2015 at 11:29 AM, Koosha Khajehmoogahi <koosha@xxxxxxxxx> wrote:
> From: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
> Signed-off-by: Koosha Khajehmoogahi <koosha@xxxxxxxxx>

Signed-off-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>

> ---
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index 1b2e981..3edcd81 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -270,6 +270,35 @@ cat > expect <<\EOF
>  * initial
>  EOF
>
> +test_expect_success 'setup merges=' '

This differs slightly from the version I posted[1], in which I had
intentionally dropped the '=' from "merges=" in the description to
normalize the output. (I think it looks slightly nicer without the
'='.)

[1]: http://article.gmane.org/gmane.comp.version-control.git/266902/

> +       git log --min-parents=2 --pretty=tformat:%s >expect_only &&
> +       git log --max-parents=1 --pretty=tformat:%s >expect_hide &&
> +       git log --min-parents=-1 --pretty=tformat:%s >expect_show
> +'
> +
> +test_log_merges() {
> +       expect=expect_$1
> +       config=${2:+-c log.merges=$2}
> +       option=${3:+--merges=$3}
> +       option=${4:-$option}
> +       test_expect_success "merges${config:+ $config}${option:+ $option}" "
> +               git $config log $option --pretty=tformat:%s >actual &&
> +               test_cmp $expect actual
> +       "
> +}
> +
> +states="show only hide"
> +for c in '' $states
> +do
> +       for o in '' $states
> +       do
> +               test_log_merges ${o:-${c:-show}} "$c" "$o"
> +       done
> +done
> +
> +test_log_merges hide show '' --no-merges
> +test_log_merges only hide '' '--merges --max-parents=2'
> +
>  test_expect_success 'log --graph with merge' '
>         git log --graph --date-order --pretty=tformat:%s |
>                 sed "s/ *\$//" >actual &&
> --
> 2.3.3.263.g095251d.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]