mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2025-11-04 21:31:19 +08:00 
			
		
		
		
	fix(lib/git): fix detection of function use in prompt
RPS1 and RPROMPT are not equivalent, though they have the same effect. Added both to detect if `git_prompt_*` is used. Fixes #12325
This commit is contained in:
		
							parent
							
								
									9d529c41cc
								
							
						
					
					
						commit
						0389310390
					
				@ -57,13 +57,13 @@ if zstyle -T ':omz:alpha:lib:git' async-prompt; then
 | 
				
			|||||||
  # or any of the other prompt variables
 | 
					  # or any of the other prompt variables
 | 
				
			||||||
  function _defer_async_git_register() {
 | 
					  function _defer_async_git_register() {
 | 
				
			||||||
    # Check if git_prompt_info is used in a prompt variable
 | 
					    # Check if git_prompt_info is used in a prompt variable
 | 
				
			||||||
    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
 | 
					    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
 | 
				
			||||||
    *(\$\(git_prompt_info\)|\`git_prompt_info\`)*)
 | 
					    *(\$\(git_prompt_info\)|\`git_prompt_info\`)*)
 | 
				
			||||||
      _omz_register_handler _omz_git_prompt_info
 | 
					      _omz_register_handler _omz_git_prompt_info
 | 
				
			||||||
      ;;
 | 
					      ;;
 | 
				
			||||||
    esac
 | 
					    esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
 | 
					    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
 | 
				
			||||||
    *(\$\(git_prompt_status\)|\`git_prompt_status\`)*)
 | 
					    *(\$\(git_prompt_status\)|\`git_prompt_status\`)*)
 | 
				
			||||||
      _omz_register_handler _omz_git_prompt_status
 | 
					      _omz_register_handler _omz_git_prompt_status
 | 
				
			||||||
      ;;
 | 
					      ;;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user