From: Marc Finet <m.dreadlock@gmail.com>
To: Frank Terbeck <ft@bewatermyfriend.org>
Cc: zsh-workers@zsh.org
Subject: Re: [PATCH 4/9] vcs_info git: set rrn before using it
Date: Tue, 16 Sep 2014 22:57:26 +0200 [thread overview]
Message-ID: <20140916225726.1b587ea1@mlap.lactee> (raw)
In-Reply-To: <87d2av2t8y.fsf@ft.bewatermyfriend.org>
On Tue, 16 Sep 2014 22:41:17 +0200
Frank Terbeck <ft@bewatermyfriend.org> wrote:
> Marc Finet wrote:
> [...]
> > diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> > b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index
> > 263a325..6231301 100644 ---
> > a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++
> > b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -115,6
> > +115,8 @@ VCS_INFO_git_getbranch () {
> > gitdir=${vcs_comm[gitdir]}
> > VCS_INFO_git_getbranch ${gitdir}
> > +gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel )
> > +rrn=${gitbase:t}
> > if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}"
> > get-revision ; then gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet
> > --verify HEAD)
> [...]
>
> This patch looks like it was mutilated by MUA. Could you resend? Maybe
> using "git send-email" or if all else fails, the .patch file attached
> to an email?
Should be better now.
Marc [still configuring my "new" machine].
This would fix handling get-revision, check-for-changes or
check-for-staged-changes when set per repository.
---
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 263a325..6231301 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -115,6 +115,8 @@ VCS_INFO_git_getbranch () {
gitdir=${vcs_comm[gitdir]}
VCS_INFO_git_getbranch ${gitdir}
+gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel )
+rrn=${gitbase:t}
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then
gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet --verify HEAD)
else
@@ -154,8 +156,6 @@ fi
VCS_INFO_adjust
VCS_INFO_git_getaction ${gitdir}
-gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel )
-rrn=${gitbase:t}
local patchdir=${gitdir}/patches/${gitbranch}
if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \
--
2.1.0
next prev parent reply other threads:[~2014-09-16 20:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 21:30 Misc patches for git completion and vcs_info Marc Finet
2014-09-12 21:30 ` [PATCH 1/9] vcs_info examples: fix typo Marc Finet
2014-09-14 9:33 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 2/9] completion git: support aliases when \n exist Marc Finet
2014-09-12 21:30 ` [PATCH 3/9] vcs_info git: detect revert or cherry-pick with multiple commits Marc Finet
2014-09-14 9:36 ` Frank Terbeck
2014-09-15 6:22 ` Phil Pennock
2014-09-12 21:30 ` [PATCH 4/9] vcs_info git: set rrn before using it Marc Finet
2014-09-14 9:33 ` Frank Terbeck
2014-09-16 20:07 ` Marc Finet
2014-09-16 20:41 ` Frank Terbeck
2014-09-16 20:57 ` Marc Finet [this message]
2014-09-16 21:23 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 5/9] vcs_info quilt: fix standalone detection Marc Finet
2014-09-14 9:42 ` Frank Terbeck
2014-09-16 20:19 ` Marc Finet
2014-09-12 21:30 ` [PATCH 6/9] vcs_info quilt: fix unapplied detection on sub-directory Marc Finet
2014-09-14 9:47 ` Frank Terbeck
2014-09-16 20:25 ` Marc Finet
2014-10-08 22:36 ` Marc Finet
2014-10-09 16:03 ` Frank Terbeck
2014-10-16 4:59 ` Marc Finet
2014-10-16 8:17 ` Frank Terbeck
2014-11-08 10:46 ` Marc Finet
2014-11-11 10:07 ` Marc Finet
2015-01-02 11:03 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 7/9] vcs_info git: fix applied-string name Marc Finet
2014-09-14 9:49 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 8/9] vcs_info git: consider patches for rebase Marc Finet
2014-09-14 10:08 ` Frank Terbeck
2014-09-14 10:13 ` Frank Terbeck
2014-09-16 20:07 ` Marc Finet
2014-09-12 21:30 ` [PATCH 9/9] completion git: fix send-email --confirm values Marc Finet
2014-09-14 10:11 ` Frank Terbeck
2014-09-12 23:50 ` Misc patches for git completion and vcs_info Bart Schaefer
2014-09-13 7:35 ` Marc Finet
2014-09-13 12:23 ` Frank Terbeck
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=20140916225726.1b587ea1@mlap.lactee \
--to=m.dreadlock@gmail.com \
--cc=ft@bewatermyfriend.org \
--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).