diff options
| author | soryu <soryu@soryu.co> | 2026-01-25 02:19:01 +0000 |
|---|---|---|
| committer | soryu <soryu@soryu.co> | 2026-01-25 02:19:01 +0000 |
| commit | a4c5e9a601b49d08e5ef3d7a36cdd29372ce2003 (patch) | |
| tree | 061a880c6ea2cd3bee2fa80137a2e7e3bf3ec6fb /makima/src/daemon/task | |
| parent | 1f223e55be79805bb1061213db4351925bc0b368 (diff) | |
| parent | 2003544969e5b7248ecd242b5cec50b324fa751b (diff) | |
| download | soryu-makima/files-under-contracts-combined.tar.gz soryu-makima/files-under-contracts-combined.zip | |
Merge origin/master into makima/files-under-contracts-combined - resolve import conflictsmakima/files-under-contracts-combined
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'makima/src/daemon/task')
| -rw-r--r-- | makima/src/daemon/task/manager.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/makima/src/daemon/task/manager.rs b/makima/src/daemon/task/manager.rs index 3fdde9b..6ba0f52 100644 --- a/makima/src/daemon/task/manager.rs +++ b/makima/src/daemon/task/manager.rs @@ -1000,7 +1000,7 @@ pub struct TaskConfig { impl Default for TaskConfig { fn default() -> Self { Self { - max_concurrent_tasks: 4, + max_concurrent_tasks: 10, max_tasks_per_contract: 10, worktree_base_dir: WorktreeManager::default_base_dir(), env_vars: HashMap::new(), @@ -4993,9 +4993,10 @@ impl TaskManagerInner { .unwrap_or_else(|| "unknown".to_string()); // 7. Push to remote (best effort - don't fail if push fails) + // Use -u origin HEAD to set upstream if not already set (new branches won't have upstream) let push_output = tokio::process::Command::new("git") .current_dir(worktree_path) - .args(["push"]) + .args(["push", "-u", "origin", "HEAD"]) .output() .await; |