Re: com php-src: ext/pcntl/pcntl.c: Fix typo in comment: ext/pcntl/pcntl.c
| From: | Yasuo Ohgaki | Date: | Thu, 29 Mar 2012 00:47:25 +0000 |
| Subject: | Re: com php-src: ext/pcntl/pcntl.c: Fix typo in comment: ext/pcntl/pcntl.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-68236@lists.php.net to get a copy of this message | ||
Hi,
I was following the instruction of the pull request page
https://qa.php.net/pulls/#repo=php-src
The instruction on the page only considered working on
master, but php-src has several active branches.
I merged this simple patch to master,
then cherry-picked the commit to 5.4. and 5.3.
git push
didn't push all branches, but the current one.
So I did
git push origin 5.4:PHP-5.4
git push origin 5.3:PHP-5.3
Is this the way should do or am I doing wrong?
The Git workflow in the wiki states, we should merge
upward rather than downward. Should I consider this
workflow is strict?
Just curious.
Thanks.
--
Yasuo Ohgaki
yohgaki@ohgaki.net
2012/3/28 Yasuo Ohgaki <yohgaki@php.net>:
> Commit: 4aeabaf8e938af00d6fe9f8316251b543640018c
> Author: Jille Timmermans <jille@quis.cx> Wed, 28 Mar 2012 16:18:23 +0200
> Committer: Yasuo Ohgaki <yohgaki@ohgaki.net> Thu, 29 Mar 2012 09:07:19 +0900
> Parents: 08089ebe16b0dffacb15b1669bc6c3a8432dcb1c
> Branches: PHP-5.4
>
> Link:
> http://git.php.net/?p=php-src.git;a=commitdiff;h=4aeabaf8e938af00d6fe9f8316251b543640018c
>
> Log:
> ext/pcntl/pcntl.c: Fix typo in comment
>
> Signed-off-by: Jille Timmermans <jille@quis.cx>
>
> Changed paths:
> M ext/pcntl/pcntl.c
>
>
> Diff:
> 4aeabaf8e938af00d6fe9f8316251b543640018c
> diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
> index 725d55b..e5910a5 100755
> --- a/ext/pcntl/pcntl.c
> +++ b/ext/pcntl/pcntl.c
> @@ -760,7 +760,7 @@ PHP_FUNCTION(pcntl_exec)
> }
>
> if (ZEND_NUM_ARGS() > 1) {
> - /* Build argumnent list */
> + /* Build argument list */
> args_hash = HASH_OF(args);
> argc = zend_hash_num_elements(args_hash);
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>