date:20120407

[PHP-CVS] com karma: fix bug with new branch: lib/Git/BugsWebPostReceiveHook.php

2012-04-07 Thread Alexander Moskaliov

Commit:661f83009aec570fffc1384bcffafbef25451818
Author:Alexander Moskaliov ir...@php.net Sat, 7 Apr 2012 14:45:22 
+0400
Parents:   61cc09b1cbe8e3dcec3cf6b0447d942755c85a7c
Branches:  master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=661f83009aec570fffc1384bcffafbef25451818

Log:
fix bug with new branch

Changed paths:
  M  lib/Git/BugsWebPostReceiveHook.php


Diff:
diff --git a/lib/Git/BugsWebPostReceiveHook.php 
b/lib/Git/BugsWebPostReceiveHook.php
index fa4ebb7..8331ea7 100644
--- a/lib/Git/BugsWebPostReceiveHook.php
+++ b/lib/Git/BugsWebPostReceiveHook.php
@@ -45,13 +45,13 @@ class BugsWebPostReceiveHook extends ReceiveHook
 
 /* do we have heads? otherwise it's a new repo! */
 $heads = implode(' ', $output);
-$not   = count($output)  0 ? sprintf('--not %s', 
escapeshellarg($heads)) : '';
+$not   = count($output)  0 ? ' --not ' . implode(' ', 
$this-escapeArrayShellArgs($heads)) : '';
 $cmd   = sprintf(
 '%s --git-dir=%s log --pretty=format:[%%ae] %%H %%s %s %s',
 \Git::GIT_EXECUTABLE,
 $repourl,
-$not,
-escapeshellarg($new)
+escapeshellarg($new),
+$not
 );
 exec($cmd, $output);
 } elseif ($new != \Git::NULLREV) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] del karma: lib/Git/BugsWebPostReceiveHook.php

2012-04-07 Thread Alexander Moskaliov

Branch: master
Deleted commits count: 1
User: Alexander Moskaliov ir...@php.net Sat, 07 Apr 2012 10:52:07 
+

Changed paths:
  M  lib/Git/BugsWebPostReceiveHook.php


Diff:
diff --git b/lib/Git/BugsWebPostReceiveHook.php 
a/lib/Git/BugsWebPostReceiveHook.php
index 8331ea7..f96fe4a 100644
--- b/lib/Git/BugsWebPostReceiveHook.php
+++ a/lib/Git/BugsWebPostReceiveHook.php
@@ -41,10 +41,8 @@ class BugsWebPostReceiveHook extends ReceiveHook
 \Git::GIT_EXECUTABLE,
 $repourl
 );
-exec($cmd, $output);
+exec($cmd, $heads);
 
-/* do we have heads? otherwise it's a new repo! */
-$heads = implode(' ', $output);
 $not   = count($output)  0 ? ' --not ' . implode(' ', 
$this-escapeArrayShellArgs($heads)) : '';
 $cmd   = sprintf(
 '%s --git-dir=%s log --pretty=format:[%%ae] %%H %%s %s %s',


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: fix double bugs: lib/Git/BugsWebPostReceiveHook.php

2012-04-07 Thread Alexander Moskaliov

Commit:bfef8080bed7733eef76800cf7960fdf67fead51
Author:Alexander Moskaliov ir...@php.net Sat, 7 Apr 2012 14:45:22 
+0400
Parents:   61cc09b1cbe8e3dcec3cf6b0447d942755c85a7c
Branches:  master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=bfef8080bed7733eef76800cf7960fdf67fead51

Log:
fix double bugs

Changed paths:
  M  lib/Git/BugsWebPostReceiveHook.php


Diff:
diff --git a/lib/Git/BugsWebPostReceiveHook.php 
b/lib/Git/BugsWebPostReceiveHook.php
index fa4ebb7..f96fe4a 100644
--- a/lib/Git/BugsWebPostReceiveHook.php
+++ b/lib/Git/BugsWebPostReceiveHook.php
@@ -41,17 +41,15 @@ class BugsWebPostReceiveHook extends ReceiveHook
 \Git::GIT_EXECUTABLE,
 $repourl
 );
-exec($cmd, $output);
+exec($cmd, $heads);
 
-/* do we have heads? otherwise it's a new repo! */
-$heads = implode(' ', $output);
-$not   = count($output)  0 ? sprintf('--not %s', 
escapeshellarg($heads)) : '';
+$not   = count($output)  0 ? ' --not ' . implode(' ', 
$this-escapeArrayShellArgs($heads)) : '';
 $cmd   = sprintf(
 '%s --git-dir=%s log --pretty=format:[%%ae] %%H %%s %s %s',
 \Git::GIT_EXECUTABLE,
 $repourl,
-$not,
-escapeshellarg($new)
+escapeshellarg($new),
+$not
 );
 exec($cmd, $output);
 } elseif ($new != \Git::NULLREV) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] del karma: lib/Git/BugsWebPostReceiveHook.php

2012-04-07 Thread Alexander Moskaliov

Branch: master
Deleted commits count: 1
User: Alexander Moskaliov ir...@php.net Sat, 07 Apr 2012 10:52:37 
+

Changed paths:
  M  lib/Git/BugsWebPostReceiveHook.php


Diff:
diff --git b/lib/Git/BugsWebPostReceiveHook.php 
a/lib/Git/BugsWebPostReceiveHook.php
index f96fe4a..b608b88 100644
--- b/lib/Git/BugsWebPostReceiveHook.php
+++ a/lib/Git/BugsWebPostReceiveHook.php
@@ -43,7 +43,7 @@ class BugsWebPostReceiveHook extends ReceiveHook
 );
 exec($cmd, $heads);
 
-$not   = count($output)  0 ? ' --not ' . implode(' ', 
$this-escapeArrayShellArgs($heads)) : '';
+$not   = count($heads)  0 ? ' --not ' . implode(' ', 
$this-escapeArrayShellArgs($heads)) : '';
 $cmd   = sprintf(
 '%s --git-dir=%s log --pretty=format:[%%ae] %%H %%s %s %s',
 \Git::GIT_EXECUTABLE,


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: fix double bugs: lib/Git/BugsWebPostReceiveHook.php

2012-04-07 Thread Alexander Moskaliov

Commit:bc220ca91ec470baab210cb652c22f10abc689c6
Author:Alexander Moskaliov ir...@php.net Sat, 7 Apr 2012 14:45:22 
+0400
Parents:   61cc09b1cbe8e3dcec3cf6b0447d942755c85a7c
Branches:  master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=bc220ca91ec470baab210cb652c22f10abc689c6

Log:
fix double bugs

Changed paths:
  M  lib/Git/BugsWebPostReceiveHook.php


Diff:
diff --git a/lib/Git/BugsWebPostReceiveHook.php 
b/lib/Git/BugsWebPostReceiveHook.php
index fa4ebb7..b608b88 100644
--- a/lib/Git/BugsWebPostReceiveHook.php
+++ b/lib/Git/BugsWebPostReceiveHook.php
@@ -41,17 +41,15 @@ class BugsWebPostReceiveHook extends ReceiveHook
 \Git::GIT_EXECUTABLE,
 $repourl
 );
-exec($cmd, $output);
+exec($cmd, $heads);
 
-/* do we have heads? otherwise it's a new repo! */
-$heads = implode(' ', $output);
-$not   = count($output)  0 ? sprintf('--not %s', 
escapeshellarg($heads)) : '';
+$not   = count($heads)  0 ? ' --not ' . implode(' ', 
$this-escapeArrayShellArgs($heads)) : '';
 $cmd   = sprintf(
 '%s --git-dir=%s log --pretty=format:[%%ae] %%H %%s %s %s',
 \Git::GIT_EXECUTABLE,
 $repourl,
-$not,
-escapeshellarg($new)
+escapeshellarg($new),
+$not
 );
 exec($cmd, $output);
 } elseif ($new != \Git::NULLREV) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch '5.3' into 5.4: main/streams/streams.c

2012-04-07 Thread Gustavo Andreacute; dos Santos Lopes

Commit:f7d407678570f8e4063b70bd30f3fc19c10442ea
Author:Gustavo André dos Santos Lopes cataphr...@php.net Sat, 7 
Apr 2012 16:34:17 +0100
Parents:   014ed76943071d674cdc308f28b74be18e1caf0c 
0f180a63ebb2d65bbe49b68d2430639b20443e9a
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f7d407678570f8e4063b70bd30f3fc19c10442ea

Log:
Merge branch '5.3' into 5.4

Changed paths:
  MM  main/streams/streams.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch '5.4': main/streams/streams.c

2012-04-07 Thread Gustavo Andreacute; dos Santos Lopes

Commit:bd5f52fd94148b97114e400962c44c29a44694c2
Author:Gustavo André dos Santos Lopes cataphr...@php.net Sat, 7 
Apr 2012 16:34:37 +0100
Parents:   7497aa9c4e48635b06b7688ecd5c1a9d32b017d4 
f7d407678570f8e4063b70bd30f3fc19c10442ea
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=bd5f52fd94148b97114e400962c44c29a44694c2

Log:
Merge branch '5.4'

Changed paths:
  MM  main/streams/streams.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com php-src: Fixed bug in new stream_get_line() when using NUL as a delimiter.: ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt main/streams/streams.c

2012-04-07 Thread Christopher Jones




On 4/7/12 8:32 AM, Gustavo Andreacute; dos Santos Lopes wrote:

Commit:0f180a63ebb2d65bbe49b68d2430639b20443e9a
Author:Gustavo André dos Santos Lopescataphr...@php.net  Sat, 7 
Apr 2012 16:32:19 +0100
Parents:   9bf8cd4b3437f6335e20843c9e3668b44761feba
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0f180a63ebb2d65bbe49b68d2430639b20443e9a

Log:
Fixed bug in new stream_get_line() when using NUL as a delimiter.

This is the issue Derick spotted a few days ago..

Changed paths:
   A  ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt
   M  main/streams/streams.c


Can you add a NEWS entry?

Thanks,

Chris

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: fix bug with new branch: lib/Git/BugsWebPostReceiveHook.php

[PHP-CVS] del karma: lib/Git/BugsWebPostReceiveHook.php

[PHP-CVS] com karma: fix double bugs: lib/Git/BugsWebPostReceiveHook.php

[PHP-CVS] del karma: lib/Git/BugsWebPostReceiveHook.php

[PHP-CVS] com karma: fix double bugs: lib/Git/BugsWebPostReceiveHook.php

[PHP-CVS] com php-src: Merge branch '5.3' into 5.4: main/streams/streams.c

[PHP-CVS] com php-src: Merge branch '5.4': main/streams/streams.c

Re: [PHP-CVS] com php-src: Fixed bug in new stream_get_line() when using NUL as a delimiter.: ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt main/streams/streams.c

8 matches

Site Navigation

Mail list logo

Footer information