Skip to content

Commit 61bd5c3

Browse files
xiciluanDaniel Kozlowski
authored andcommitted
bug fix on auto rebase for clearer error msg (#12)
1 parent 0006ce6 commit 61bd5c3

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

src/workflow/ArcanistDiffWorkflow.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,19 +354,23 @@ private function runRebaseToStable() {
354354
$do_rebase = true;
355355
if ($this->getArgument('no-rebase')) {
356356
$do_rebase = false;
357+
return true;
357358
}
358359
if (file_exists(".git/rebase-merge")) {
359360
$do_rebase = false;
360361
echo "It seems like you are in the middle of a rebase already; will not perform auto-rebase.";
362+
return true;
361363
}
362364
exec('git remote get-url origin', $remote_url, $git_remote_retval);
363365
if ($git_remote_retval == 1) {
364366
$do_rebase = false;
365367
echo "Failed to execute `git remote get-url origin`, please check if you are under the correct repo.";
368+
return true;
366369
}
367370
if ($remote_url[0] != "git@github.com:robinhoodmarkets/rh.git" && $remote_url[0] != "git@github.com:robinhoodmarkets/rh" && $remote_url[0] != "ssh://git@github.com/robinhoodmarkets/rh.git") {
368371
$do_rebase = false;
369372
echo "Will not perform auto-rebase since you are currently outside of `rh` monorepo.";
373+
return true;
370374
}
371375
if ($do_rebase) {
372376
echo "Running arc rebase... \n";

0 commit comments

Comments
 (0)