@@ -340,24 +340,34 @@ def git_repo_updates(facade_helper, repo_git):
340340
341341 # session.log_activity('Verbose', f'remote default is {logremotedefault}.')
342342
343- getremotedefault = ["git" , "-C" , absolute_path , "symbolic-ref " , "refs/remotes/ origin/HEAD " ]
343+ getremotedefault = ["git" , "-C" , absolute_path , "remote " , "show" , " origin" ]
344344
345- return_code_remote , remotedefault = facade_helper .run_git_command (
345+ return_code_remote , output = facade_helper .run_git_command (
346346 getremotedefault ,
347- timeout = 60 ,
347+ timeout = 60 , # 1 minute for remote query
348348 capture_output = True ,
349349 operation_description = 'get remote default branch'
350350 )
351- if return_code_remote == 0 and remotedefault :
352- remotedefault = remotedefault .split ('/' )[- 1 ]
351+
352+ remotedefault = ""
353+ if return_code_remote == 0 and output :
354+ for line in output .split ('\n ' ):
355+ if "HEAD branch" in line :
356+ parts = line .split (":" , 1 )
357+ if len (parts ) > 1 :
358+ remotedefault = parts [1 ].strip ()
359+ break
353360
354361 facade_helper .log_activity (
355362 'Verbose' , f'remote default getting checked out is: { remotedefault } .' )
356363
357- checkout_cmd = ["git" , "-C" , absolute_path , "checkout" , remotedefault ]
364+ getremotedefault = ["git" , "-C" , absolute_path , "checkout" , remotedefault ]
365+
366+ facade_helper .log_activity (
367+ 'Verbose' , f"get remote default command is: \n \n git -C { absolute_path } checkout { remotedefault } \n \n " )
358368
359369 return_code_remote_default_again , _ = facade_helper .run_git_command (
360- checkout_cmd ,
370+ getremotedefault ,
361371 timeout = 600 , # 10 minutes for git checkout
362372 capture_output = False ,
363373 operation_description = f'git checkout { remotedefault } '
@@ -408,23 +418,30 @@ def git_repo_updates(facade_helper, repo_git):
408418
409419# session.log_activity('Verbose', f'remote default is {logremotedefault}.')
410420
411- getremotedefault = ["git" , "-C" , absolute_path , "symbolic-ref " , "refs/remotes/ origin/HEAD " ]
421+ getremotedefault = ["git" , "-C" , absolute_path , "remote " , "show" , " origin" ]
412422
413- return_code_remote , remotedefault = facade_helper .run_git_command (
423+ return_code_remote , output = facade_helper .run_git_command (
414424 getremotedefault ,
415- timeout = 60 ,
425+ timeout = 60 , # 1 minute for remote query
416426 capture_output = True ,
417427 operation_description = 'get remote default branch'
418428 )
419- if return_code_remote == 0 and remotedefault :
420- remotedefault = remotedefault .split ('/' )[- 1 ]
429+
430+ remotedefault = ""
431+ if return_code_remote == 0 and output :
432+ for line in output .split ('\n ' ):
433+ if "HEAD branch" in line :
434+ parts = line .split (":" , 1 )
435+ if len (parts ) > 1 :
436+ remotedefault = parts [1 ].strip ()
437+ break
421438
422439 try :
423440
424- checkout_cmd = ["git" , "-C" , absolute_path , "checkout" , remotedefault ]
441+ getremotedefault = ["git" , "-C" , absolute_path , "checkout" , remotedefault ]
425442
426443 return_code_remote_default , _ = facade_helper .run_git_command (
427- checkout_cmd ,
444+ getremotedefault ,
428445 timeout = 600 , # 10 minutes for git checkout
429446 capture_output = False ,
430447 operation_description = f'git checkout { remotedefault } '
@@ -480,6 +497,8 @@ def git_repo_updates(facade_helper, repo_git):
480497 pass
481498
482499 cmdpull2 = ["git" , "-C" , absolute_path , "pull" ]
500+
501+ print (cmdpull2 )
483502 return_code , _ = facade_helper .run_git_command (
484503 cmdpull2 ,
485504 timeout = 600 , # 10 minutes for git pull
0 commit comments