]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'feature/status_against_remote_tracking'
authorRichard Hartmann <richih@debian.org>
Sat, 25 Oct 2014 05:57:56 +0000 (07:57 +0200)
committerRichard Hartmann <richih@debian.org>
Sat, 25 Oct 2014 05:57:56 +0000 (07:57 +0200)
Conflicts:
vcsh

vcsh

diff --git a/vcsh b/vcsh
index 58ecb7f3ea7415fa4f94c0351985fe11af016161..246a7da993d5b33a55c73b83ebca193c8bb7d0d5 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -379,6 +379,12 @@ status() {
 status_helper() {
        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
        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'
        VCSH_COMMAND_RETURN_CODE=$?
 }