tenir compte de la valeur de origin
This commit is contained in:
		
							parent
							
								
									7c67a7f37a
								
							
						
					
					
						commit
						881bcde1e3
					
				| @ -69,16 +69,16 @@ function is_hotfix_branch() { is_any_branch "$1" hotfix; } | ||||
| function is_feature_branch() { is_any_branch "$1" feature; } | ||||
| 
 | ||||
| function list_release_branches() { | ||||
|     local p="$1" | ||||
|     git_list_${p:+p}branches | grep '^release-' | ||||
|     local origin="$1" | ||||
|     git_list_${origin:+p}branches "$origin" | grep '^release-' | ||||
| } | ||||
| function list_hotfix_branches() { | ||||
|     local p="$1" | ||||
|     git_list_${p:+p}branches | grep '^hotfix-' | ||||
|     local origin="$1" | ||||
|     git_list_${origin:+p}branches "$origin" | grep '^hotfix-' | ||||
| } | ||||
| function list_feature_branches() { | ||||
|     local p="$1" | ||||
|     git_list_${p:+p}branches | | ||||
|     local origin="$1" | ||||
|     git_list_${origin:+p}branches "$origin" | | ||||
|     grep -vF master | | ||||
|     grep -vF develop | | ||||
|     grep -v '^release-' | | ||||
|  | ||||
							
								
								
									
										2
									
								
								pdev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pdev
									
									
									
									
									
								
							| @ -103,7 +103,7 @@ if [ "$action" == branch ]; then | ||||
|     source="${2:-develop}" | ||||
|      | ||||
|     if [ -z "$feature" ]; then | ||||
|         setx -a branches=list_feature_branches p | ||||
|         setx -a branches=list_feature_branches "$origin" | ||||
|      | ||||
|         if [ ${#branches[*]} -eq 0 ]; then | ||||
|             # En l'absence de feature branch, basculer sur develop | ||||
|  | ||||
							
								
								
									
										4
									
								
								prel
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								prel
									
									
									
									
									
								
							| @ -162,7 +162,7 @@ if [ "$action" == update ]; then | ||||
|         else | ||||
|             # sinon, prendre une décision en fonction des branches de release | ||||
|             # qui existent déjà | ||||
|             setx -a branches=list_release_branches p | ||||
|             setx -a branches=list_release_branches "$origin" | ||||
|             if [ ${#branches[*]} -eq 0 ]; then | ||||
|                 # en l'absence de branche de release, proposer d'en créer une | ||||
|                 incversion=menu | ||||
| @ -220,7 +220,7 @@ if [ "$action" == checkout ]; then | ||||
|     source="${2:-develop}" | ||||
| 
 | ||||
|     if [ -z "$release" ]; then | ||||
|         setx -a branches=list_release_branches p | ||||
|         setx -a branches=list_release_branches "$origin" | ||||
| 
 | ||||
|         if [ ${#branches[*]} -eq 0 ]; then | ||||
|             # en l'absence de branche de release, basculer sur master | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Jephte CLAIN
						Jephte CLAIN