@@ -1035,16 +1035,18 @@ def delete_local_branches(st: List[StackEntry], verbose: bool):
1035
1035
run_shell_command (cmd , check = False , quiet = not verbose )
1036
1036
1037
1037
1038
- def delete_remote_branches (st : List [StackEntry ], remote : str , verbose : bool ):
1038
+ def delete_remote_branches (
1039
+ st : List [StackEntry ], remote : str , verbose : bool , branch_name_template : str
1040
+ ):
1039
1041
log (h ("Deleting remote branches" ), level = 1 )
1040
1042
run_shell_command (["git" , "fetch" , "--prune" , remote ], quiet = not verbose )
1041
1043
1042
- username = get_gh_username ( )
1044
+ branch_name_base = get_branch_name_base ( branch_name_template )
1043
1045
refs = get_command_output (
1044
1046
[
1045
1047
"git" ,
1046
1048
"for-each-ref" ,
1047
- f"refs/remotes/{ remote } /{ username } /stack " ,
1049
+ f"refs/remotes/{ remote } /{ branch_name_base } " ,
1048
1050
"--format=%(refname)" ,
1049
1051
]
1050
1052
).split ()
@@ -1111,7 +1113,9 @@ def command_land(args: CommonArgs):
1111
1113
)
1112
1114
1113
1115
delete_local_branches (st , args .verbose )
1114
- delete_remote_branches (st [:1 ], args .remote , args .verbose )
1116
+ delete_remote_branches (
1117
+ st [:1 ], args .remote , args .verbose , args .branch_name_template
1118
+ )
1115
1119
1116
1120
# If local branch {target} exists, rebase it on the remote/target
1117
1121
if branch_exists (args .target ):
@@ -1177,7 +1181,9 @@ def command_abandon(args: CommonArgs):
1177
1181
)
1178
1182
1179
1183
delete_local_branches (st , args .verbose )
1180
- delete_remote_branches (st , args .remote , args .verbose )
1184
+ delete_remote_branches (
1185
+ st , args .remote , args .verbose , args .branch_name_template
1186
+ )
1181
1187
log (h (blue ("SUCCESS!" )), level = 1 )
1182
1188
1183
1189
0 commit comments