Skip to content
Snippets Groups Projects
Commit e4bc5444 authored by Richard Hartmann's avatar Richard Hartmann
Browse files

Merge branch 'feature/status_against_remote_tracking'

Conflicts:
	vcsh
parents 712cef9c 35d1c19f
No related branches found
No related tags found
No related merge requests found
...@@ -379,6 +379,12 @@ status() { ...@@ -379,6 +379,12 @@ status() {
status_helper() { status_helper() {
GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
use use
remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2> /dev/null) && {
commits_behind=$(git log ..${remote_tracking_branch} --oneline | wc -l)
commits_ahead=$(git log ${remote_tracking_branch}.. --oneline | wc -l)
[ ${commits_behind} -ne 0 ] && echo "Behind $remote_tracking_branch by $commits_behind commits"
[ ${commits_ahead} -ne 0 ] && echo "Ahead of $remote_tracking_branch by $commits_ahead commits"
}
git status --short --untracked-files='no' git status --short --untracked-files='no'
VCSH_COMMAND_RETURN_CODE=$? VCSH_COMMAND_RETURN_CODE=$?
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment