]> 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:

vcsh: Make status show commits ahead/behind remote
authorRichard Hartmann <richih@debian.org>
Wed, 7 May 2014 07:07:56 +0000 (09:07 +0200)
committerRichard Hartmann <richih@debian.org>
Wed, 7 May 2014 07:07:56 +0000 (09:07 +0200)
This is work in progress:
* It does not deal with repos without a remote tracking branch
* It does not share any info if run on a single repo
* I should probably factor this out in a new function

github: in response to richih/vcsh#123

vcsh

diff --git a/vcsh b/vcsh
index 18cd9e542097cbc006e9287e5730b130bc10e2a3..0ec2bba8c9ddc2d830403608d6df3be8fbe9fa42 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -314,6 +314,12 @@ status() {
                        echo "$VCSH_REPO_NAME:"
                        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                        use
                        echo "$VCSH_REPO_NAME:"
                        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                        use
+                       # TODO repos without remote tracking branch error out
+                       remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u})
+                       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=$?
                        echo
                        git status --short --untracked-files='no'
                        VCSH_COMMAND_RETURN_CODE=$?
                        echo