From: Tim Lee <progscriptclone@gmail.com>
To: zsh-workers@zsh.org
Subject: [PATCH] Improve vcs_info example for ahead/behind git commits
Date: Mon, 29 Mar 2021 05:36:28 +0800 [thread overview]
Message-ID: <20210328213628.7rwz62bq5p2isd6b@home-guest> (raw)
This patch improves the example hook that shows +N/-N when the
local git branch is ahead-of or behind the remote HEAD.
Improvements:
* Use git-rev-list's `--count` option instead of piping to `wc -l`.
`--count` has been available since git 1.7.2
(https://github.com/git/git/commit/f69c501832ecd6880602c55565508e70c3a013d5)
* Remove unnecessary use of `${hook_com[branch]}` because `@{upstream}`
defaults to the current branch when no branch name is provided.
`@{upstream}` was introduced in git 1.7.0
(https://github.com/git/git/commit/28fb84382b0eb728534dbe2972bbfec3f3d83dd9)
diff --git a/Misc/vcs_info-examples b/Misc/vcs_info-examples
index 94b8a7b5e..36d4d3bf8 100644
--- a/Misc/vcs_info-examples
+++ b/Misc/vcs_info-examples
@@ -179,14 +179,18 @@ function +vi-git-st() {
local ahead behind
local -a gitstatus
- # for git prior to 1.7
+ # for git prior to 1.7.0
# ahead=$(git rev-list origin/${hook_com[branch]}..HEAD | wc -l)
- ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
+ # for git 1.7.0 and 1.7.1
+ # ahead=$(git rev-list @{upstream}..HEAD 2>/dev/null | wc -l)
+ ahead=$(git rev-list --count @{upstream}..HEAD 2>/dev/null)
(( $ahead )) && gitstatus+=( "+${ahead}" )
- # for git prior to 1.7
+ # for git prior to 1.7.0
# behind=$(git rev-list HEAD..origin/${hook_com[branch]} | wc -l)
- behind=$(git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
+ # for git 1.7.0 and 1.7.1
+ # behind=$(git rev-list HEAD..@{upstream} 2>/dev/null | wc -l)
+ behind=$(git rev-list --count HEAD..@{upstream} 2>/dev/null)
(( $behind )) && gitstatus+=( "-${behind}" )
hook_com[misc]+=${(j:/:)gitstatus}
next reply other threads:[~2021-03-28 21:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-28 21:36 Tim Lee [this message]
2021-03-29 7:06 ` Daniel Shahaf
2021-03-29 9:30 ` Tim Lee
2021-03-29 9:52 ` Daniel Shahaf
2021-03-29 10:39 ` Tim Lee
2021-03-29 11:50 ` Daniel Shahaf
2021-04-10 20:51 ` Lawrence Velázquez
2021-04-13 11:34 ` Daniel Shahaf
2021-04-13 11:58 ` Tim Lee
2021-04-13 14:01 ` Daniel Shahaf
2021-04-13 15:01 ` Tim Lee
2021-03-29 15:20 ` Lawrence Velázquez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210328213628.7rwz62bq5p2isd6b@home-guest \
--to=progscriptclone@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).