Merge pull request RainbowEngineer#10 from billy3321/master

Please add my sign!!
tailingchen · Dec 6, 2016 · b562e66 · b562e66
2 parents a0f2758 + e06d841
commit b562e66
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/sign.sh b/sign.sh
@@ -1,21 +1,27 @@
 #!/bin/bash
 
+# uncomment this for debug
+# set -o xtrace
+
 # This is a file use to sign. Please input file as parameter.
 # Usage: ./sign.sh signed_by_${USERNAME}.txt
 
 pushd $(dirname $0)
+REPO=$(cat .git/config | grep "[email protected]" | cut -f 2 -d ':' | sed s/\.git//)
 
 git pull
+git remote add upstream https://github.com/RainbowEngineer/taiwan_love_wins.git
+git fetch upstream
+git merge upstream/master
+git push
 git add $1
 git commit
 git push
-REPO=$(cat .git/config | grep "[email protected]" | cut -f 2 -d ':' | sed s/\.git//)
 
 if [ -f $(which hub) ]; then
   echo '自動送 pull-request...'
   hub pull-request -m "Please add my sign!!" -b RainbowEngineer/taiwan_love_wins:master
 else
-
   echo '系統沒有安裝hub，請前往以下網址送出pull request：'
   echo "https://github.com/${REPO}/pull/new/master"
 fi

diff --git a/signatures/sign_by_bater.txt → signatures/signed_by_bater.txt b/signatures/sign_by_bater.txt → signatures/signed_by_bater.txt
diff --git a/signatures/sign_by_tonyq → signatures/signed_by_tonyq.txt b/signatures/sign_by_tonyq → signatures/signed_by_tonyq.txt
diff --git a/signatures/sign_by_tw0517tw → signatures/signed_by_tw0517tw.txt b/signatures/sign_by_tw0517tw → signatures/signed_by_tw0517tw.txt