* Re: [PR PATCH] [Updated] register git-shell and change zsh completion
2019-06-25 6:22 [PR PATCH] register git-shell and change zsh completion voidlinux-github
@ 2019-06-26 1:09 ` voidlinux-github
2019-06-26 1:09 ` voidlinux-github
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-26 1:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages git
https://github.com/void-linux/void-packages/pull/12666
register git-shell and change zsh completion
* zsh: use completion script from git itself
* git: register git-shell to /etc/shells
A patch file from https://github.com/void-linux/void-packages/pull/12666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-12666.patch --]
[-- Type: application/text/x-diff, Size: 2932 bytes --]
From 7e00f0f16ad820f25f1a7e125a30dcb3a373e357 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 25 Jun 2019 11:29:15 +0700
Subject: [PATCH 1/2] git: register git-shell to /etc/shells
git-shell is a restricted login shell for git-only SSH access
---
srcpkgs/git/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 938516fe7a0..8edad8af013 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -20,6 +20,7 @@ changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNot
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f
replaces="git-perl>=0"
+register_shell=/usr/bin/git-shell
subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret"
From 67372e1f41316fda31737c437e9f39eb9832eb8b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 25 Jun 2019 11:30:52 +0700
Subject: [PATCH 2/2] zsh: use completion script from git itself
From git 2.17, git has new flag `--git-completion-helper',
which will provide more up-to-date completion,
prefer git completion script over zsh's bundled script.
---
srcpkgs/git/template | 4 +++-
srcpkgs/zsh/template | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 8edad8af013..898cd5ba11c 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
# Template file for 'git'
pkgname=git
version=2.22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
ac_cv_snprintf_returns_bogus=no"
@@ -39,6 +39,8 @@ post_install() {
make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} install-doc
vinstall contrib/completion/git-completion.bash 644 \
usr/share/bash-completion/completions git
+ vinstall contrib/completion/git-completion.zsh 644 \
+ usr/share/zsh/site-functions _git
vinstall contrib/completion/git-prompt.sh 644 usr/share/git
make -C contrib/subtree DESTDIR=${DESTDIR} prefix=/usr install install-man
vinstall contrib/credential/libsecret/git-credential-libsecret 755 usr/libexec/git-core
diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template
index 6aae68a0180..7fca01ca8eb 100644
--- a/srcpkgs/zsh/template
+++ b/srcpkgs/zsh/template
@@ -1,7 +1,7 @@
# Template file for 'zsh'
pkgname=zsh
version=5.7.1
-revision=1
+revision=2
build_style=gnu-configure
make_build_target="all info"
make_install_args="install.info"
@@ -37,7 +37,7 @@ pre_configure() {
sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
done
rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
- rm -f Completion/Unix/Command/_{notmuch,osc,systemd}
+ rm -f Completion/Unix/Command/_{notmuch,osc,systemd,git}
}
post_install() {
vlicense LICENCE
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] register git-shell and change zsh completion
2019-06-25 6:22 [PR PATCH] register git-shell and change zsh completion voidlinux-github
2019-06-26 1:09 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-26 1:09 ` voidlinux-github
2019-07-05 15:43 ` voidlinux-github
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-26 1:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages git
https://github.com/void-linux/void-packages/pull/12666
register git-shell and change zsh completion
* zsh: use completion script from git itself
* git: register git-shell to /etc/shells
A patch file from https://github.com/void-linux/void-packages/pull/12666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-12666.patch --]
[-- Type: application/text/x-diff, Size: 2932 bytes --]
From 7e00f0f16ad820f25f1a7e125a30dcb3a373e357 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 25 Jun 2019 11:29:15 +0700
Subject: [PATCH 1/2] git: register git-shell to /etc/shells
git-shell is a restricted login shell for git-only SSH access
---
srcpkgs/git/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 938516fe7a0..8edad8af013 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -20,6 +20,7 @@ changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNot
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f
replaces="git-perl>=0"
+register_shell=/usr/bin/git-shell
subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret"
From 67372e1f41316fda31737c437e9f39eb9832eb8b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 25 Jun 2019 11:30:52 +0700
Subject: [PATCH 2/2] zsh: use completion script from git itself
From git 2.17, git has new flag `--git-completion-helper',
which will provide more up-to-date completion,
prefer git completion script over zsh's bundled script.
---
srcpkgs/git/template | 4 +++-
srcpkgs/zsh/template | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 8edad8af013..898cd5ba11c 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
# Template file for 'git'
pkgname=git
version=2.22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
ac_cv_snprintf_returns_bogus=no"
@@ -39,6 +39,8 @@ post_install() {
make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} install-doc
vinstall contrib/completion/git-completion.bash 644 \
usr/share/bash-completion/completions git
+ vinstall contrib/completion/git-completion.zsh 644 \
+ usr/share/zsh/site-functions _git
vinstall contrib/completion/git-prompt.sh 644 usr/share/git
make -C contrib/subtree DESTDIR=${DESTDIR} prefix=/usr install install-man
vinstall contrib/credential/libsecret/git-credential-libsecret 755 usr/libexec/git-core
diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template
index 6aae68a0180..7fca01ca8eb 100644
--- a/srcpkgs/zsh/template
+++ b/srcpkgs/zsh/template
@@ -1,7 +1,7 @@
# Template file for 'zsh'
pkgname=zsh
version=5.7.1
-revision=1
+revision=2
build_style=gnu-configure
make_build_target="all info"
make_install_args="install.info"
@@ -37,7 +37,7 @@ pre_configure() {
sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
done
rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
- rm -f Completion/Unix/Command/_{notmuch,osc,systemd}
+ rm -f Completion/Unix/Command/_{notmuch,osc,systemd,git}
}
post_install() {
vlicense LICENCE
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: register git-shell and change zsh completion
2019-06-25 6:22 [PR PATCH] register git-shell and change zsh completion voidlinux-github
2019-06-26 1:09 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-26 1:09 ` voidlinux-github
@ 2019-07-05 15:43 ` voidlinux-github
2019-07-06 10:23 ` voidlinux-github
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-07-05 15:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/12666#issuecomment-508798733
Comment:
Hi @zdtcd,
1. it would be best if you split the git-shell commit to its own PR.
2. I use your proposed zsh completion change for a day now and found some failures (might be due to my config though, i'm not sure here). It's yet not clear which one to prefer. As @leahneukirchen pointed out: "i had the impression that zsh's was more correct, but it's updated less often"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: register git-shell and change zsh completion
2019-06-25 6:22 [PR PATCH] register git-shell and change zsh completion voidlinux-github
` (2 preceding siblings ...)
2019-07-05 15:43 ` voidlinux-github
@ 2019-07-06 10:23 ` voidlinux-github
2019-07-06 10:31 ` [PR PATCH] [Updated] " voidlinux-github
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-07-06 10:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
New comment by zdtcd on void-packages repository
https://github.com/void-linux/void-packages/pull/12666#issuecomment-508915027
Comment:
On 2019-07-05 08:43:43 -0700, Piraty wrote:
> Hi @zdtcd,
>
> 1. it would be best if you split the git-shell commit to its own PR.
Will do now.
> 2. I use your proposed zsh completion change for a day now and found
> some failures (might be due to my config though, i'm not sure
> here). It's yet not clear which one to prefer. As @leahneukirchen
> pointed out: "i had the impression that zsh's was more correct,
> but it's updated less often"
I think it's better to hold the zsh completion change for a while,
since git's people are fixing the (zsh) completion.
c.f: https://public-inbox.org/git/20190621223107.8022-1-felipe.contreras@gmail.com/
--
Danh
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] register git-shell and change zsh completion
2019-06-25 6:22 [PR PATCH] register git-shell and change zsh completion voidlinux-github
` (3 preceding siblings ...)
2019-07-06 10:23 ` voidlinux-github
@ 2019-07-06 10:31 ` voidlinux-github
2019-07-06 10:31 ` voidlinux-github
2019-07-08 15:12 ` [PR PATCH] [Closed]: register git-shell voidlinux-github
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-07-06 10:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages git
https://github.com/void-linux/void-packages/pull/12666
register git-shell and change zsh completion
* zsh: use completion script from git itself
* git: register git-shell to /etc/shells
A patch file from https://github.com/void-linux/void-packages/pull/12666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-12666.patch --]
[-- Type: application/text/x-diff, Size: 1120 bytes --]
From 40ab3171eb59e3612d7e3ef096ea6ecdd33cfd68 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 25 Jun 2019 11:29:15 +0700
Subject: [PATCH] git: register git-shell to /etc/shells
git-shell is a restricted login shell for git-only SSH access
---
srcpkgs/git/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 938516fe7a0..11630afb5a0 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
# Template file for 'git'
pkgname=git
version=2.22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
ac_cv_snprintf_returns_bogus=no"
@@ -20,6 +20,7 @@ changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNot
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f
replaces="git-perl>=0"
+register_shell=/usr/bin/git-shell
subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] register git-shell and change zsh completion
2019-06-25 6:22 [PR PATCH] register git-shell and change zsh completion voidlinux-github
` (4 preceding siblings ...)
2019-07-06 10:31 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-07-06 10:31 ` voidlinux-github
2019-07-08 15:12 ` [PR PATCH] [Closed]: register git-shell voidlinux-github
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-07-06 10:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages git
https://github.com/void-linux/void-packages/pull/12666
register git-shell and change zsh completion
* zsh: use completion script from git itself
* git: register git-shell to /etc/shells
A patch file from https://github.com/void-linux/void-packages/pull/12666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-12666.patch --]
[-- Type: application/text/x-diff, Size: 1120 bytes --]
From 40ab3171eb59e3612d7e3ef096ea6ecdd33cfd68 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 25 Jun 2019 11:29:15 +0700
Subject: [PATCH] git: register git-shell to /etc/shells
git-shell is a restricted login shell for git-only SSH access
---
srcpkgs/git/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 938516fe7a0..11630afb5a0 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
# Template file for 'git'
pkgname=git
version=2.22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
ac_cv_snprintf_returns_bogus=no"
@@ -20,6 +20,7 @@ changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNot
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f
replaces="git-perl>=0"
+register_shell=/usr/bin/git-shell
subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Closed]: register git-shell
2019-06-25 6:22 [PR PATCH] register git-shell and change zsh completion voidlinux-github
` (5 preceding siblings ...)
2019-07-06 10:31 ` voidlinux-github
@ 2019-07-08 15:12 ` voidlinux-github
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-07-08 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
There's a closed pull request on the void-packages repository
register git-shell
https://github.com/void-linux/void-packages/pull/12666
Description: * zsh: use completion script from git itself
* git: register git-shell to /etc/shells
^ permalink raw reply [flat|nested] 8+ messages in thread