From e5655ed216ddb0f77fa5cac197755a69231aea13 Mon Sep 17 00:00:00 2001 From: Ade Attwood Date: Sat, 10 Jul 2021 21:12:13 +0100 Subject: [PATCH] refactor(shell): refactor ggpushmr git alias ggpushmr has now been renamed to ggpushpr. The only place it is called a "Merge Request" is in Gitlab. All the community has now decided to go with Github's "Pull Request". This also makes the branch param optional. If you don't pass a branch name it will make the pull request against the repositories default branch. --- site-modules/core/files/oh-my-zsh/custom/git.zsh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/site-modules/core/files/oh-my-zsh/custom/git.zsh b/site-modules/core/files/oh-my-zsh/custom/git.zsh index 35218c4..1f3aa7c 100644 --- a/site-modules/core/files/oh-my-zsh/custom/git.zsh +++ b/site-modules/core/files/oh-my-zsh/custom/git.zsh @@ -13,11 +13,10 @@ function gi() { curl -sL https://www.gitignore.io/api/$@; } -function ggpushmr() { +function ggpushpr() { if [[ -z "$1" ]]; then - echo "Error: Target branch to create your merge request against is missing" - exit 1 + ggpush -o merge_request.merge_when_pipeline_succeeds -o merge_request.create -o merge_request.remove_source_branch + else + ggpush -o merge_request.merge_when_pipeline_succeeds -o merge_request.create -o merge_request.remove_source_branch -o merge_request.target="$1" fi - - ggpush -o merge_request.create -o merge_request.target="$1" -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch }