[PATCHt2] completion: prompt: fix for Zsh

2019-06-05 Thread Felipe Contreras
We can add colour in Zsh without the need of pcmode. Signed-off-by: Felipe Contreras --- contrib/completion/git-prompt.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 983e419d2b..fd2b049dbd 1

Custom Made USB drives

2019-06-05 Thread Stacy
Hi, I wanted to follow up from last week. Did you receive the email I sent you? Our company manufactures USB Flash Drives, printed with your logo. They make the perfect marketing tool for your business or organization. We offer low minimum quantities, and all memory sizes. Over 150 Stock Model

[PATCH v4] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Tigran Mkrtchyan
As many CI/CD tools don't allow to control command line options when executing `git tag` command, a default value in the configuration file will allow to enforce tag signing if required. The new config-file option tag.gpgSign is added to define default behavior of tag signings. To override default

[PATCH v3] config: learn the "onbranch:" includeIf condition

2019-06-05 Thread Denton Liu
Currently, if a user wishes to have individual settings per branch, they are required to manually keep track of the settings in their head and manually set the options on the command-line or change the config at each branch. Teach config the "onbranch:" includeIf condition so that it can condition

Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Mkrtchyan, Tigran
- Original Message - > From: "Junio C Hamano" > To: "Tigran Mkrtchyan" > Cc: "git" , "Jonathan Nieder" , > "Johannes Schindelin" > > Sent: Wednesday, June 5, 2019 10:57:34 PM > Subject: Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags > be GPG-signed > Junio C Ha

Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Junio C Hamano
Junio C Hamano writes: > "Mkrtchyan, Tigran" writes: > >>> But more importantly, I think we should justify why this "not >>> allowed" makes sense as the design of the feature. A plausible >>> alternative design would simply follow the "last one wins" paradigm, >>> ... >> This is matter of conven

Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Mkrtchyan, Tigran
Thanks for clarification. I will update the patch and re-send it. Tigran. - Original Message - > From: "Junio C Hamano" > To: "Tigran Mkrtchyan" > Cc: "git" , "Jonathan Nieder" , > "Johannes Schindelin" > > Sent: Wednesday, June 5, 2019 10:46:05 PM > Subject: Re: [PATCH v3] tag: add t

Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Junio C Hamano
"Mkrtchyan, Tigran" writes: >> But more importantly, I think we should justify why this "not >> allowed" makes sense as the design of the feature. A plausible >> alternative design would simply follow the "last one wins" paradigm, >> ... > This is matter of convention. Oh, if you put it that way

Re: [PATCH 00/11] [RFC] Create 'core.size=large' setting to update config defaults

2019-06-05 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > This patch series includes a few new config options we created to speed up > certain critical commands in VFS for Git. On their own, they would > contribute little value as it is hard to discover new config variables. > Instead, I've created this RFC as

Re: [PATCH] clang-format: use git grep to generate the ForEachMacros list

2019-06-05 Thread Taylor Blau
Hi Miguel, On Tue, Jun 04, 2019 at 12:48:14AM +0200, Miguel Ojeda wrote: > The ForEachMacros list can reasonably be generated grepping > the C source code for macros with 'for_each' in their name. > > Taken almost verbatim from the .clang-format file in the Linux kernel. > > Signed-off-by: Miguel

Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Mkrtchyan, Tigran
- Original Message - > From: "Junio C Hamano" > To: "Tigran Mkrtchyan" > Cc: "git" , "Jonathan Nieder" , > "Johannes Schindelin" > > Sent: Wednesday, June 5, 2019 6:25:46 PM > Subject: Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags > be GPG-signed > Tigran Mkrt

[PATCH v2 1/2] config/alias.txt: change " and ' to `

2019-06-05 Thread Denton Liu
Before, the documentation would mix " and ' for code and config snippets. Change these instances to ` so that they are marked up in monospace. Signed-off-by: Denton Liu --- Documentation/config/alias.txt | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentati

[PATCH v2 0/2] Doc: document alias accepting non-command first word

2019-06-05 Thread Denton Liu
Thanks for the review, Johannes. I think it's a good idea to add another alias for `-p` so included that suggestion. Also, while I was at it, I found a typo so I fixed that too. Changes since v1: * s/loud-merge/loud-rebase/ * Add `-p` as another example since that was Dscho's original use-case

[PATCH v2 2/2] config/alias.txt: document alias accepting non-command first word

2019-06-05 Thread Denton Liu
One can see that an alias that begins with a non-command first word, such as `loud-rebase = -c commit.verbose=true rebase`, is permitted. However, this isn't immediately obvious to users as alias instances typically begin with a command. Document the fact that an alias can begin with a non-command

Re: [PATCH] t5551: test usage of chunked encoding explicitly

2019-06-05 Thread Jeff King
On Wed, Jun 05, 2019 at 12:26:24PM -0700, Jonathan Tan wrote: > When run using GIT_TEST_PROTOCOL_VERSION=2, a test in t5551 fails > because 4 POSTs (probe, ls-refs, probe, fetch) are sent instead of 2 > (probe, fetch). > > One way to resolve this would be to relax the condition (from "= 2" to > g

Re: [PATCH] t5551: test usage of chunked encoding explicitly

2019-06-05 Thread Derrick Stolee
On 6/5/2019 3:26 PM, Jonathan Tan wrote: > When run using GIT_TEST_PROTOCOL_VERSION=2, a test in t5551 fails > because 4 POSTs (probe, ls-refs, probe, fetch) are sent instead of 2 > (probe, fetch). > > One way to resolve this would be to relax the condition (from "= 2" to > greater than 1, say), b

Re: [PATCH 1/1] git-prompt.sh: update shell variable instructions.

2019-06-05 Thread Edward D'Souza
Confirming that I can't reproduce this either. Should have done that first before continuing with a PR from two years ago! On Wed, Jun 5, 2019 at 12:07 PM SZEDER Gábor wrote: > > On Wed, Jun 05, 2019 at 08:06:07AM -0700, Edward D'Souza via GitGitGadget > wrote: > > From: Edward D'Souza > > > >

[PATCH] t5551: test usage of chunked encoding explicitly

2019-06-05 Thread Jonathan Tan
When run using GIT_TEST_PROTOCOL_VERSION=2, a test in t5551 fails because 4 POSTs (probe, ls-refs, probe, fetch) are sent instead of 2 (probe, fetch). One way to resolve this would be to relax the condition (from "= 2" to greater than 1, say), but upon further inspection, the test probably shouldn

Xender App

2019-06-05 Thread April Joy Diaz
I have found a file transfer app which is much faster than Bluetooth. Try Xender for iOS:! Http://goo.gl/VIgi5l other platforms: http://goo.gl/qCCrt4 gabriel...@gmail.com

Re: What's cooking in git.git (May 2019, #05; Thu, 30)

2019-06-05 Thread Nickolai Belakovski
On Thu, May 30, 2019 at 5:20 PM Junio C Hamano wrote: > > * nb/branch-show-other-worktrees-head (2019-05-07) 3 commits > - branch: add worktree info on verbose output > - branch: update output to include worktree info > - ref-filter: add worktreepath atom > > "git branch --list" learned to sho

Re: [PATCH v3 01/14] commit-graph: document commit-graph chains

2019-06-05 Thread Derrick Stolee
On 6/5/2019 1:22 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" writes: > >> From: Derrick Stolee >> >> Add a basic description of commit-graph chains. More details about the >> feature will be added as we add functionality. This introduction gives a >> high-level overview to the

Re: [PATCH v3 01/14] commit-graph: document commit-graph chains

2019-06-05 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > From: Derrick Stolee > > Add a basic description of commit-graph chains. More details about the > feature will be added as we add functionality. This introduction gives a > high-level overview to the goals of the feature and the basic layout of > commi

Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Junio C Hamano
Tigran Mkrtchyan writes: > As many CI/CD tools don't allow to control command line options when > executing `git tag` command, a default value in the configuration file > will allow to enforce tag signing if required. Hmm. Would these "many" tools still allow arbigrary configuration set to affe

Re: [PATCH v3] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Todd Zullinger
Hi, Tigran Mkrtchyan wrote: > diff --git a/Documentation/config/tag.txt b/Documentation/config/tag.txt > index 663663bdec..675483c3c3 100644 > --- a/Documentation/config/tag.txt > +++ b/Documentation/config/tag.txt > @@ -8,6 +8,13 @@ tag.sort:: > linkgit:git-tag[1]. Without the "--sort=" opt

Re: [PATCH 1/1] git-prompt.sh: update shell variable instructions.

2019-06-05 Thread SZEDER Gábor
On Wed, Jun 05, 2019 at 08:06:07AM -0700, Edward D'Souza via GitGitGadget wrote: > From: Edward D'Souza > > Clarify the need to set variables like GIT_PS1_SHOWDIRTYSTATE before > "source ~/.git-prompt.sh" is executed in your shell init process. > > If you set these preferences too late i.e. afte

[PATCH v3] tag: add tag.gpgSign config option to force all tags be GPG-signed

2019-06-05 Thread Tigran Mkrtchyan
As many CI/CD tools don't allow to control command line options when executing `git tag` command, a default value in the configuration file will allow to enforce tag signing if required. The new config-file option tag.gpgSign enforces signed tags. Additional command line option --no-sign is added

Re: worktree add already exists

2019-06-05 Thread Ingo Wolf
Am 05.06.2019 um 12:17 schrieb Duy Nguyen: "worktree add --no-checkout --keep-worktree" is quite readable worktree add --no-checkout -f (orce) I've expected to work on an not empty directory

[PATCH 0/1] Improve instructions around how to set git-prompt preference variables.

2019-06-05 Thread Edward D'Souza via GitGitGadget
When I first tried to use the git-prompt.sh script, I followed the instructions at the top of the file and everything worked, except for the "GIT_PS1_SHOWDIRTYSTATE" preference. Even though I had it set to true, I wasn't seeing the "()" and "(+)" in my shell prompt. After a few hours of poking arou

[PATCH 1/1] git-prompt.sh: update shell variable instructions.

2019-06-05 Thread Edward D'Souza via GitGitGadget
From: Edward D'Souza Clarify the need to set variables like GIT_PS1_SHOWDIRTYSTATE before "source ~/.git-prompt.sh" is executed in your shell init process. If you set these preferences too late i.e. after .git-prompt.sh executes, they will silently fail to take effect. Signed-off-by: Edward D'S

Re: [PATCH 2/2] config/alias.txt: document alias accepting non-command first word

2019-06-05 Thread Johannes Schindelin
Hi Denton, On Fri, 31 May 2019, Denton Liu wrote: > One can see that an alias that begins with a non-command first word, > such as `loud-rebase = -c commit.verbose=true rebase`, is permitted. > However, this isn't immediately obvious to users as alias instances > typically begin with a command. >

Re: [RFC/PATCH 0/5] Fix fetch regression with transport helpers

2019-06-05 Thread Duy Nguyen
On Wed, Jun 5, 2019 at 6:27 PM Jeff King wrote: > > On Wed, Jun 05, 2019 at 10:12:12AM +0200, Johannes Schindelin wrote: > > > This fails on macOS, in t5601, both in our osx-clang and osx-gcc jobs, as > > well as in the StaticAnalysis job. For details, see > > https://dev.azure.com/gitgitgadget/gi

Re: [PATCH] mergetools: add support for VS Code

2019-06-05 Thread Johannes Schindelin
Hi Wen Bei Li, On Tue, 4 Jun 2019, Wen Bei Li wrote: > Teach difftool and mergetool about VS Code and VS Code Insiders > > Signed-off-by: Wen Bei Li > --- > Hello Johannes, thank you for reviewing my patch. It's the first time > I've done this via email. Heh, I hear you. It makes me happy that

Re: [RFC/PATCH 0/5] Fix fetch regression with transport helpers

2019-06-05 Thread Jeff King
On Wed, Jun 05, 2019 at 10:12:12AM +0200, Johannes Schindelin wrote: > This fails on macOS, in t5601, both in our osx-clang and osx-gcc jobs, as > well as in the StaticAnalysis job. For details, see > https://dev.azure.com/gitgitgadget/git/_build/results?buildId=10206 Hmm. I'm having a hard time

Re: worktree add already exists

2019-06-05 Thread Duy Nguyen
On Tue, Jun 4, 2019 at 1:32 AM Eric Sunshine wrote: > > On Mon, Jun 3, 2019 at 5:47 AM Duy Nguyen wrote: > > On Sun, Jun 2, 2019 at 2:11 PM Eric Sunshine > > wrote: > > > On Mon, May 27, 2019 at 11:32 AM Ingo Wolf wrote: > > > > I would like to attach an existing dir to git (make it a workdir)

Re: [PATCH v2] config: learn the "onbranch:" includeIf condition

2019-06-05 Thread Duy Nguyen
On Sat, Jun 1, 2019 at 2:34 AM Denton Liu wrote: > > Currently, if a user wishes to have individual settings per branch, they > are required to manually keep track of the settings in their head and > manually set the options on the command-line or change the config at > each branch. > > Teach conf

Re: [RFC/PATCH 0/5] Fix fetch regression with transport helpers

2019-06-05 Thread Johannes Schindelin
On Mon, 3 Jun 2019, Felipe Contreras wrote: > Felipe Contreras (5): > t5801 (remote-helpers): cleanup refspec stuff > t5801 (remote-helpers): add test to fetch tags > fetch: trivial cleanup > fetch: make the code more understandable > fetch: fix regression with transport helpers > > bui

Re: [PATCH v2] config: learn the "onbranch:" includeIf condition

2019-06-05 Thread Johannes Schindelin
Hi Denton, On Fri, 31 May 2019, Johannes Schindelin wrote: > On Fri, 31 May 2019, Denton Liu wrote: > > > Currently, if a user wishes to have individual settings per branch, > > they are required to manually keep track of the settings in their head > > and manually set the options on the command-