Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F1189998
phabricator_push.patch
fedegiova (Federico Giovanardi)
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Authored By
fedegiova
Mar 25 2016, 10:38 AM
2016-03-25 10:38:29 (UTC+0)
Size
1 KB
Referenced Files
None
Subscribers
None
phabricator_push.patch
View Options
diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index 53dc417..5c23656 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -771,9 +771,9 @@ final class DiffusionCommitHookEngine extends Phobject {
$stray_heads = array();
+ $head_map = array();
if ($old_heads && !$new_heads) {
// This is a branch deletion with "--close-branch".
- $head_map = array();
foreach ($old_heads as $old_head) {
$head_map[$old_head] = array(self::EMPTY_HASH);
}
@@ -798,7 +798,6 @@ final class DiffusionCommitHookEngine extends Phobject {
'{node}\1');
}
- $head_map = array();
foreach (new FutureIterator($dfutures) as $future_head => $dfuture) {
list($stdout) = $dfuture->resolvex();
$descendant_heads = array_filter(explode("\1", $stdout));
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
87954
Default Alt Text
phabricator_push.patch (1 KB)
Attached To
Mode
T10665: Incorrect divergent heads message on mercurial push
Attached
Detach File
Event Timeline
Log In to Comment