@@ -1344,13 +1344,19 @@ function GitAdapter:symmetric_diff_revs(rev_arg)
1344
1344
))
1345
1345
end
1346
1346
1347
- out , code , stderr = self :exec_sync ({ " merge-base" , r1 , r2 }, self .ctx .toplevel )
1347
+ out , code , stderr = self :exec_sync (
1348
+ { " merge-base" , r1 , r2 },
1349
+ { cwd = self .ctx .toplevel , fail_on_empty = true , retry = 2 }
1350
+ )
1348
1351
if code ~= 0 then
1349
1352
return err ()
1350
1353
end
1351
1354
local left_hash = out [1 ]:gsub (" ^%^" , " " )
1352
1355
1353
- out , code , stderr = self :exec_sync ({ " rev-parse" , " --revs-only" , r2 }, self .ctx .toplevel )
1356
+ out , code , stderr = self :exec_sync (
1357
+ { " rev-parse" , " --revs-only" , r2 },
1358
+ { cwd = self .ctx .toplevel , fail_on_empty = true , retry = 2 }
1359
+ )
1354
1360
if code ~= 0 then
1355
1361
return err ()
1356
1362
end
@@ -1407,7 +1413,8 @@ function GitAdapter:parse_revs(rev_arg, opt)
1407
1413
end
1408
1414
else
1409
1415
local rev_strings , code , stderr = self :exec_sync (
1410
- { " rev-parse" , " --revs-only" , rev_arg }, self .ctx .toplevel
1416
+ { " rev-parse" , " --revs-only" , rev_arg },
1417
+ { cwd = self .ctx .toplevel , fail_on_empty = true , retry = 2 }
1411
1418
)
1412
1419
if code ~= 0 then
1413
1420
utils .err (utils .vec_join (
0 commit comments