reya
/
common-configs
1
0
Fork 0
Code Releases Activity

Autocommitted updated scripts from mari-wovn

Browse Source
main
Mari 5 years ago
parent 867e2ac1ea
commit 5a813cb4e1
1 changed files with 3 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      per-host/mari-wovn/.bash_aliases

6
per-host/mari-wovn/.bash_aliases
Unescape View File

@ -50,7 +50,7 @@ function _start_branch() {
printf "=== Accessing an existing branch named ${branch}...\n" printf "=== Accessing an existing branch named ${branch}...\n"
cd ~/equalizer/"${branch}" || exit "$?" cd ~/equalizer/"${branch}" || exit "$?"
wovn_check_update || printf "=== Some updates are necessary.\n" wovn_check_update || printf "=== Some updates are necessary.\n"
printf "\a=== Ready to start using branch ${branch}!\n" printf "=== Ready to start using branch ${branch}!\n"
fi fi
) )
if [[ -d ~/equalizer/"$branch" ]]; then if [[ -d ~/equalizer/"$branch" ]]; then
@ -65,7 +65,7 @@ function get_current_branch_name() {
} }
function get_remote_branch_name() { function get_remote_branch_name() {
git rev-parse --abbrev-ref --symbolic-full-name '@{u}' git rev-parse --quiet --abbrev-ref --symbolic-full-name '@{u}'
} }
function wovn_pull() { function wovn_pull() {
@ -85,7 +85,7 @@ function wovn_check_update() {
printf "=== Retrieving the latest data from the repository...\n" printf "=== Retrieving the latest data from the repository...\n"
cd "$(git rev-parse --show-toplevel)" cd "$(git rev-parse --show-toplevel)"
git fetch --all || exit "$?" git fetch --all || exit "$?"
git log --graph --oneline --simplify-by-decoration --decorate-refs=refs/{remotes/origin,heads}/{develop{,_front},master,$(get_current_branch_name)} "^$(git merge-base {master,develop{,_front}}^1)" origin/{develop{_front,},master} $(get_current_branch_name) $(get_remote_branch_name) git log --graph --oneline --no-merges --simplify-by-decoration --decorate-refs=refs/{remotes/origin,heads}/{develop{,_front},master,$(get_current_branch_name)} "^$(git merge-base {master,develop{,_front}}^1)" origin/{develop{_front,},master} $(get_current_branch_name) $(get_remote_branch_name)
{ [[ "$(git rev-parse master)" == "$(git rev-parse origin/master)" ]] \ { [[ "$(git rev-parse master)" == "$(git rev-parse origin/master)" ]] \
&& [[ "$(git rev-parse develop_front)" == "$(git rev-parse origin/develop_front)" ]] \ && [[ "$(git rev-parse develop_front)" == "$(git rev-parse origin/develop_front)" ]] \
&& [[ "$(git rev-parse develop)" == "$(git rev-parse origin/develop)" ]] \ && [[ "$(git rev-parse develop)" == "$(git rev-parse origin/develop)" ]] \

Write Preview
Loading…
Cancel
Save