mirrors
/
ambevar-dotfiles
mirror of https://gitlab.com/ambrevar/dotfiles/
1
0
Fork 0
Code Issues Releases Wiki Activity

local/bin/homesync: Properly error out when current branch has no remote

master
Pierre Neidhardt 2018-06-11 23:53:20 +02:00
parent 36a1d04342
commit 2164a9ccac
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.local/bin/homesync
View File

@ -58,8 +58,13 @@ project_status() {
for i in ~/dotfiles ~/.password-store ~/personal ~/projects/* ~/.local/share/emacs/site-lisp/* "$@"; do
[ ! -d "$i/.git" ] && continue
CHANGED=true
unmerged=$(git -C "$i" log --oneline origin/master..)
project_status "$i" "Unmerged commits" "$unmerged"
upstream=$(git -C "$i" rev-parse --abbrev-ref --symbolic-full-name @{u} 2>&1)
if [ $? -eq 0 ]; then
unmerged=$(git -C "$i" log --oneline "$upstream"..)
project_status "$i" "Unmerged commits" "$unmerged"
else
project_status "$i" "Unmerged commits" "$upstream"
fi
project_status "$i" "Unstaged files" "$(git -C "$i" diff --name-only)"
project_status "$i" "Staged files" "$(git -C "$i" diff --name-only --cached)"
if $OPT_UPDATE && [ -n "$unmerged" ]; then