File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 1- from .cli import main
1+ from stack_pr .cli import main
22
33if __name__ == "__main__" :
44 main ()
Original file line number Diff line number Diff line change 5353import re
5454from subprocess import SubprocessError
5555
56- from .git import (
56+ from stack_pr .git import (
5757 branch_exists ,
5858 check_gh_installed ,
5959 get_current_branch_name ,
6060 get_gh_username ,
6161 get_uncommitted_changes ,
6262)
63- from .shell_commands import get_command_output , run_shell_command
63+ from stack_pr .shell_commands import get_command_output , run_shell_command
6464from typing import List , NamedTuple , Optional , Pattern
6565
6666# A bunch of regexps for parsing commit messages and PR descriptions
@@ -743,7 +743,7 @@ def deduce_base(args: CommonArgs) -> CommonArgs:
743743 if args .base :
744744 return args
745745 deduced_base = get_command_output (
746- ["git" , "merge-base" , args .head , f"{ args .remote } /main " ]
746+ ["git" , "merge-base" , args .head , f"{ args .remote } /{ args . target } " ]
747747 )
748748 return CommonArgs (deduced_base , args .head , args .remote , args .target )
749749
You can’t perform that action at this time.
0 commit comments