From: Tim Lee <progscriptclone@gmail.com>
To: Daniel Shahaf <d.s@daniel.shahaf.name>
Cc: zsh-workers@zsh.org
Subject: Re: [PATCH] Improve vcs_info example for ahead/behind git commits
Date: Mon, 29 Mar 2021 17:30:56 +0800 [thread overview]
Message-ID: <20210329093056.fegqam75id4yfkiq@home-guest> (raw)
In-Reply-To: <20210329070611.GM18178@tarpaulin.shahaf.local2>
> > * 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)
>
> I'm not sure that's unnecessary, for two reasons:
>
> 1. hook_com[branch], as opposed to hook_com[branch_orig], may have been
> changed by a previous hook.
>
> 2. There may be educational value to demonstrating a use of
> hook_com[branch], even if it's implied.
>
> WDYT?
Okay. I was not aware of these reasons. I am still very much a beginner
(both to zsh and to mailing lists ...).
> > 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}" )
>
> The version of this function in my zshrc starts like this:
> .
> git rev-parse @{upstream} >/dev/null 2>&1 || return 0
> local -a x=( $(git rev-list --left-right --count HEAD...@{upstream} ) )
The snippet below displays N/M. How would you make it display +N/-M
instead?
git rev-parse @{upstream} >/dev/null 2>&1 || return 0
local -a x=( $(git rev-list --left-right --count HEAD...@{upstream} ) )
hook_com[misc]="${(j:/:)x}"
> The first line is to handle a detached HEAD, I think, and should
> presumably be added?
Why not do this instead:
local -a x=( $(git rev-list --left-right --count HEAD...@{upstream} 2>/dev/null ) )
---
Note: when replying to my email, please ensure that my email address is
included in the 'To:' field, since I am not subscribed to the mailing
list.
next prev parent reply other threads:[~2021-03-29 9:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-28 21:36 Tim Lee
2021-03-29 7:06 ` Daniel Shahaf
2021-03-29 9:30 ` Tim Lee [this message]
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=20210329093056.fegqam75id4yfkiq@home-guest \
--to=progscriptclone@gmail.com \
--cc=d.s@daniel.shahaf.name \
--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).