Re: [PATCH try2 7/8] push: add --set-publish option

2013-10-13 Thread Felipe Contreras
On Sun, Oct 13, 2013 at 5:03 AM, Eric Sunshine  wrote:
> On Sat, Oct 12, 2013 at 3:05 AM, Felipe Contreras
>  wrote:
>> diff --git a/t/t5529-push-publish.sh b/t/t5529-push-publish.sh
>> new file mode 100755
>> index 000..2037026
>> --- /dev/null
>> +++ b/t/t5529-push-publish.sh
>> @@ -0,0 +1,70 @@
>> +#!/bin/sh
>> +
>> +test_description='push with --set-publish'
>> +
>> +. ./test-lib.sh
>> +
>> +test_expect_success 'setup bare parent' '
>> +   git init --bare parent &&
>> +   git remote add publish parent
>> +'
>> +
>> +test_expect_success 'setup local commit' '
>> +   echo content >file &&
>> +   git add file &&
>> +   git commit -m one
>> +'
>> +
>> +check_config() {
>> +   (echo $2; echo $3) >expect.$1
>> +   (git config branch.$1.pushremote
>> +git config branch.$1.push) >actual.$1
>> +   test_cmp expect.$1 actual.$1
>> +}
>
> Do you want to maintain &&-chain in this test?

As much as we want to do it in t/t5523-push-upstream.sh, which has
this exact function.

-- 
Felipe Contreras
--
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


Re: [PATCH try2 7/8] push: add --set-publish option

2013-10-13 Thread Eric Sunshine
On Sat, Oct 12, 2013 at 3:05 AM, Felipe Contreras
 wrote:
> diff --git a/t/t5529-push-publish.sh b/t/t5529-push-publish.sh
> new file mode 100755
> index 000..2037026
> --- /dev/null
> +++ b/t/t5529-push-publish.sh
> @@ -0,0 +1,70 @@
> +#!/bin/sh
> +
> +test_description='push with --set-publish'
> +
> +. ./test-lib.sh
> +
> +test_expect_success 'setup bare parent' '
> +   git init --bare parent &&
> +   git remote add publish parent
> +'
> +
> +test_expect_success 'setup local commit' '
> +   echo content >file &&
> +   git add file &&
> +   git commit -m one
> +'
> +
> +check_config() {
> +   (echo $2; echo $3) >expect.$1
> +   (git config branch.$1.pushremote
> +git config branch.$1.push) >actual.$1
> +   test_cmp expect.$1 actual.$1
> +}

Do you want to maintain &&-chain in this test?

> +
> +test_expect_success 'push -p master:master' '
> +   git push -p publish master:master &&
> +   check_config master publish refs/heads/master
> +'
> +
> +test_expect_success 'push -u master:other' '
> +   git push -p publish master:other &&
> +   check_config master publish refs/heads/other
> +'
> +
> +test_expect_success 'push -p --dry-run master:otherX' '
> +   git push -p --dry-run publish master:otherX &&
> +   check_config master publish refs/heads/other
> +'
> +
> +test_expect_success 'push -p master2:master2' '
> +   git branch master2 &&
> +   git push -p publish master2:master2 &&
> +   check_config master2 publish refs/heads/master2
> +'
> +
> +test_expect_success 'push -p master2:other2' '
> +   git push -p publish master2:other2 &&
> +   check_config master2 publish refs/heads/other2
> +'
> +
> +test_expect_success 'push -p :master2' '
> +   git push -p publish :master2 &&
> +   check_config master2 publish refs/heads/other2
> +'
> +
> +test_expect_success 'push -u --all' '
> +   git branch all1 &&
> +   git branch all2 &&
> +   git push -p --all &&
> +   check_config all1 publish refs/heads/all1 &&
> +   check_config all2 publish refs/heads/all2
> +'
> +
> +test_expect_success 'push -p HEAD' '
> +   git checkout -b headbranch &&
> +   git push -p publish HEAD &&
> +   check_config headbranch publish refs/heads/headbranch
> +'
> +
> +test_done
--
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