summaryrefslogtreecommitdiff
path: root/pull.sh
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-10 21:50:01 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-10 21:50:01 +0300
commitef9a68cc014c8a32ec7dd466a69978d77c45add3 (patch)
treeeaf1196cd81508d87276a6deb0209876fb8dc8c5 /pull.sh
parent85b0c87088ac499f96adce92c014b92e729c27bb (diff)
downloadall-ef9a68cc014c8a32ec7dd466a69978d77c45add3.tar.gz
all-ef9a68cc014c8a32ec7dd466a69978d77c45add3.tar.bz2
all-ef9a68cc014c8a32ec7dd466a69978d77c45add3.tar.xz
all-ef9a68cc014c8a32ec7dd466a69978d77c45add3.zip
Show branch name in all scripts.halloween2015
Diffstat (limited to 'pull.sh')
-rwxr-xr-xpull.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/pull.sh b/pull.sh
index 93a49d6..1b044df 100755
--- a/pull.sh
+++ b/pull.sh
@@ -8,7 +8,7 @@ function status {
fi
DIR=$(pwd)
cd "$1"
- echo "$2:"
+ echo "$2 ($(git symbolic-ref --short -q HEAD)):"
if [[ "${CMD}" == "force" ]]; then
git pull --commit --no-edit
cd "$DIR"
@@ -34,7 +34,7 @@ function status2 {
STR=$(git diff --name-only)
STR2=$(git status|grep "Your branch is ahead")
STR3=$(git status -s -uno)
- echo "$2:"
+ echo "$2 ($(git symbolic-ref --short -q HEAD)):"
if [[ -n "${STR}${STR2}${STR3}" ]]; then
echo -e "\e[1;31mCant pull because changes not pushed\e[0m"
else