Skip to content

Commit

Permalink
fix pull-request issue - (I hope that this issue was fixed)
Browse files Browse the repository at this point in the history
  • Loading branch information
sinetoami committed Oct 24, 2018
1 parent 1d8fcd2 commit 78d7d1f
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions vpsm
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@ template_path() {
echo "$VOID_PKGS/srcpkgs/$1/template"
}

void_linux_remote() {
git remote -v | rg void-linux/void-packages | awk '{print $1}' | head -1
}

longest_word () {
declare -a pkgs=$@
declare -i longest=0
Expand Down Expand Up @@ -436,9 +440,10 @@ case "$cmd" in
;;

pull-request|pr)
! [ -z "$1" ] && m=$@ || m=$(git log -1 --pretty=%B)
! [ -z "$1" ] && m="$*" || m="$(git log -1 --pretty=%B)"
msg -n "Create a pull-request "
wrapcommand hub pull-request -m $m
git push -u $(void_linux_remote) $(current_branch)
wrapcommand hub pull-request -m "$m"
;;

push-commit|pc)
Expand All @@ -447,7 +452,7 @@ case "$cmd" in
;;

update-repo|upr)
lrepo=$(git remote -v | rg void-linux/void-packages | awk '{print $1}' | head -1)
lrepo=$(void_linux_remote)
msg "Pull commits from void-linux official repo->$lrepo "
git checkout master
git pull --rebase $lrepo master
Expand Down

0 comments on commit 78d7d1f

Please sign in to comment.