forked from ungleich-public/cdist
		
	correctly create branch variable
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								a1879ebe0c
							
						
					
				
			
			
				commit
				
					
						995e2c44ee
					
				
			
		
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
					@ -41,7 +41,7 @@ read wait
 | 
				
			||||||
version=$lib_version
 | 
					version=$lib_version
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# get target branch
 | 
					# get target branch
 | 
				
			||||||
branch=${version%.?}
 | 
					branch=${version%\.*}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# add tag
 | 
					# add tag
 | 
				
			||||||
printf "Enter tag description for %s> " "$version"
 | 
					printf "Enter tag description for %s> " "$version"
 | 
				
			||||||
| 
						 | 
					@ -49,7 +49,7 @@ read tagmessage
 | 
				
			||||||
git tag "$version" -m "$tagmessage"
 | 
					git tag "$version" -m "$tagmessage"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Import into current version branch
 | 
					# Import into current version branch
 | 
				
			||||||
printf "Press enter to git merge into $branch > "
 | 
					printf "Press enter to git merge into branch \"$branch\" > "
 | 
				
			||||||
read prompt
 | 
					read prompt
 | 
				
			||||||
git checkout $branch
 | 
					git checkout $branch
 | 
				
			||||||
git merge master
 | 
					git merge master
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue