Re: [PATCH] refs.c: get_ref_cache: use a bucket hash

On Sat, Nov 14, 2015 at 02:35:01PM +0100, Andreas Krey wrote: > On Fri, 13 Nov 2015 19:01:18 +, Jeff King wrote: > ... > > 2. But for a little more work, pushing the is_git_directory() check > > out to the call-sites gives us probably saner semantics overall. > > Oops, now I get

Re: --color-diff='.' considered useful

Michael J Gruber writes: > git tip of the day: > > git diff --color-words='.' > git show --color-words='.' Probably my main usage of --color-words indeed (except I omit the single quotes ;-) ). I think this deserves an explicit mention in the doc. -- Matthieu Moy

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

On Mon, Nov 16, 2015 at 05:01:03PM +0100, Johannes Schindelin wrote: > To clarify the Git for Windows scenario: SHELL_PATH is indeed set to > `/bin/sh`, but reportedly it is converted into a full Windows path when we > leave the POSIX emulation layer, i.e. when `git.exe` is called (which has >

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

Hi Peff, On Fri, 13 Nov 2015, Jeff King wrote: > It's possible somebody could be doing something clever with $SHELL, but > I kind of doubt it. If they want to do something clever, it is much > easier to put it directly on the exec line, and have the normal $SHELL > run their clever thing. To

Re: [PATCH v6] Add git-grep threads param

On Mon, Nov 16, 2015 at 05:11:16AM -0800, Victor Leschuk wrote: > The earlier version of this patch is already included in /pu branch, > however as we all agreed ($gmane/280299) we have changed the default > behavior and the meaning of "0". The question is: what is the right > way to include

RE: [bug] git 2.6.2 (64-bit) blocks keyboard input (running in RDP, Win7 x64)

Hi Johannes, Thanks for your response. I've already workarounded the issue by using OpenSSH. It seems there is no simple way to configure Jenkins Git plugin to call Putty first under LOCAL_SYSTEM account, so using OpenSSH is much simpler in this case. Best regards, -Vasily. -Original

HVR Magnetics Co.,Ltd representative/collecting Agent Needed:Exe

Good day to you, It is my pleasure to forward the following offer of Appointment to you . We are a Chinese/Japanese based company who specializes in the production of Heavy duty lifting equipment, We are in search of a Reputable Company/Individual that can act as our Company sales

Re: [bug] git 2.6.2 (64-bit) blocks keyboard input (running in RDP, Win7 x64)

Hi Vasily, On Tue, 10 Nov 2015, Ryabov, Vasily V wrote: > I'm trying to run something like this (on the remote machine (Win7 x64 with > git 2.6.2 64-bit) through RDP): > ``` > git pull --tags --progress ssh://@:/ > +refs/heads/*:refs/remotes/origin/* > ``` > It worked on local machine with git

[PATCH] push: add recurseSubmodules config option

The --recurse-submodules command line parameter has existed for some time but it has no config file equivalent. Following the style of the corresponding parameter for git fetch, let's invent push.recurseSubmodules to provide a default for this parameter. This also requires the addition of

RE: [PATCH v6] Add git-grep threads param

Hello all, The earlier version of this patch is already included in /pu branch, however as we all agreed ($gmane/280299) we have changed the default behavior and the meaning of "0". The question is: what is the right way to include changes from patch v6 (this one) into already merged patch to

Re: [PATCH] check-ignore: correct documentation about output

Ping. On zo, 2015-11-08 at 21:10 +0100, Dennis Kaarsemaker wrote: > By default git check-ignore shows only the filenames that will be > ignored, not the pattern that causes their exclusion. > > Signed-off-by: Dennis Kaarsemaker > --- > Documentation/git-check-ignore.txt

Re: GitGui: get rid of information popup window

Hi Francis, On Thu, 12 Nov 2015, Francis ANDRE wrote: > This popup saying that "No difference has been detected" is little bit > boring and useless since it states that an automatic resync will be > started and there is no way to stop the resync. > > Can GitGui remove this popup? No, Git GUI

--color-diff='.' considered useful

git tip of the day: git diff --color-words='.' git show --color-words='.' That will help you find that 1 character change that a failed default word split hides from your eyes. I guess everyone here will know already, but I found that super useful and much easier than trying to get a

Re: [PATCH v8 00/10] refs backend pre-vtable

On Tue, 2015-11-10 at 12:42 +0100, Michael Haggerty wrote: > Another re-roll of this patch series, to address the comments of > Ramsay Jones (thanks!) about v7 [1]. > > This version has the following changes compared to v7: > > * Drop "refs: make is_branch public" patch. This was already done >

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

Am 14.11.2015 um 01:10 schrieb Stefan Beller: On Fri, Nov 13, 2015 at 3:41 PM, Jeff King wrote: On Fri, Nov 13, 2015 at 06:38:07PM -0500, Jeff King wrote: On Fri, Nov 13, 2015 at 03:16:01PM -0800, Stefan Beller wrote: Junio wrote on Oct 09, 2014: This is so non-standard a

Re: [PATCH] push: add recurseSubmodules config option

Am 16.11.2015 um 19:31 schrieb Mike Crowe: On Monday 16 November 2015 at 10:15:24 -0800, Stefan Beller wrote: The code itself looks good to me, one nit in the tests though. @@ -79,6 +87,119 @@ test_expect_success 'push succeeds after commit was pushed to remote' ' ) '

Re: [PATCH] push: add recurseSubmodules config option

On Mon, Nov 16, 2015 at 5:24 AM, Mike Crowe wrote: > The --recurse-submodules command line parameter has existed for some > time but it has no config file equivalent. > > Following the style of the corresponding parameter for git fetch, let's > invent push.recurseSubmodules to

Re: [PATCH] push: add recurseSubmodules config option

On Monday 16 November 2015 at 10:15:24 -0800, Stefan Beller wrote: > The code itself looks good to me, one nit in the tests though. > > > @@ -79,6 +87,119 @@ test_expect_success 'push succeeds after commit was > > pushed to remote' ' > > ) > > ' > > > > +test_expect_success 'push

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

Am 16.11.2015 um 20:25 schrieb Stefan Beller: On Mon, Nov 16, 2015 at 10:59 AM, Jens Lehmann wrote: Am 14.11.2015 um 01:10 schrieb Stefan Beller: Thanks for pointing out that we already have some kind of server support. I wonder if we should add an additional way to make

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

Hi Pat, On Mon, 9 Nov 2015, Pat Thoyts wrote: > Johannes Schindelin writes: > > >On Tue, 27 Oct 2015, Johannes Schindelin wrote: > > > >> On Mon, 26 Oct 2015, Junio C Hamano wrote: > >> > >> > James McCoy writes: > >> > > >> > >> The code

[PATCH] Optimize usage of grep by passing -q

Instead of redirecting all grep output to /dev/null, we can just pass in -q instead. This preserves the exit code behavior, but is faster. As grep returns true if it finds at least one match, grep can exit promptly after finding the first line and doesn't need to find more occurrences which would

Re: [PATCH v4 0/9] Reduce index load time

Hi Duy, On Sun, 1 Nov 2015, Nguyễn Thái Ngọc Duy wrote: > This is the rebased version since last time [1] with > s/free_index_shm/release_index_shm/ as suggested by David Turner. It > introduces a daemon that can cache index data in memory so that > subsequent git processes can avoid reading

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

On Mon, Nov 16, 2015 at 10:59 AM, Jens Lehmann wrote: > Am 14.11.2015 um 01:10 schrieb Stefan Beller: >> >> On Fri, Nov 13, 2015 at 3:41 PM, Jeff King wrote: >>> >>> On Fri, Nov 13, 2015 at 06:38:07PM -0500, Jeff King wrote: >>> On Fri, Nov 13, 2015 at

Re: [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout

On Sun, Nov 15, 2015 at 8:08 AM, wrote: > From: Lars Schneider > > In rare cases kill/cleanup operations in tests fail. Retry these > operations with a timeout to make the test less flaky. > > Signed-off-by: Lars Schneider

Re: [PATCH] notes: allow merging from arbitrary references

On Sun, Nov 15, 2015 at 11:55 PM, Johan Herland wrote: > Additionally, if we suspect that passing non-notes trees to read-only > operations will be a common error, we could add a simple heuristic to > the notes code, to warn (or even abort) if we strongly suspect that we > are

Re: [PATCH] push: add recurseSubmodules config option

On Mon, Nov 16, 2015 at 8:24 AM, Mike Crowe wrote: > The --recurse-submodules command line parameter has existed for some > time but it has no config file equivalent. > > Following the style of the corresponding parameter for git fetch, let's > invent push.recurseSubmodules to

Re: [PATCH v2 2/2] completion: add support for completing email aliases

On Sun, Nov 15, 2015 at 3:22 PM, Jacob Keller wrote: > Using the new --list-aliases option from git-send-email, add completion > for --to, --cc, and --bcc with the available configured aliases. > > Signed-off-by: Jacob Keller > --- > diff --git

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Mon, 2015-11-16 at 18:56 -0500, Eric Sunshine wrote: > On Mon, Nov 16, 2015 at 6:50 PM, Eric Sunshine om> wrote: > > Also, shouldn't --list-aliases (or --dump-aliases) be mutually > > exclusive with many of the other options? New tests would check > > such > >

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

On Mon, Nov 16, 2015 at 1:42 PM, Jens Lehmann wrote: > Am 16.11.2015 um 20:25 schrieb Stefan Beller: >> >> On Mon, Nov 16, 2015 at 10:59 AM, Jens Lehmann >> wrote: >>> >>> Am 14.11.2015 um 01:10 schrieb Stefan Beller: Thanks for pointing out

Re: [PATCH v2 2/2] completion: add support for completing email aliases

On Mon, 2015-11-16 at 18:33 -0500, Eric Sunshine wrote: > On Sun, Nov 15, 2015 at 3:22 PM, Jacob Keller om> wrote: > > Using the new --list-aliases option from git-send-email, add > > completion > > for --to, --cc, and --bcc with the available configured aliases. > > > >

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Mon, Nov 16, 2015 at 6:40 PM, Keller, Jacob E wrote: > On Mon, 2015-11-16 at 18:30 -0500, Eric Sunshine wrote: >> Also, is it possible that some consumer down the road might want >> richer output which includes the expansion of each alias? For >> instance, it could

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Mon, 2015-11-16 at 18:50 -0500, Eric Sunshine wrote: > It should be possible to extract the alias within the shell itself > without a separate process. For instance: > > read alias rest > > will leave the first token in $alias and the remainder of the line in > $rest, and it's all done

[PATCH v3 1/2] sendemail: teach git-send-email to dump alias names

From: Jacob Keller Add an option "dump-aliases" which changes the default behavior of git-send-email. This mode will simply read the alias files configured by sendemail.aliasesfile and sendemail.aliasfiletype and dump a list of all configured aliases, one per line. The

[PATCH v3 2/2] completion: add support for completing email aliases

From: Jacob Keller Using the new --dump-alias-names option from git-send-email, add completion for --to, --cc, and --bcc with the available configured aliases. Signed-off-by: Jacob Keller --- Notes: - v2 * Use git-send-email for parsing

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Mon, 2015-11-16 at 18:30 -0500, Eric Sunshine wrote: > On Sun, Nov 15, 2015 at 3:22 PM, Jacob Keller om> wrote: > > Add an option "list-aliases" which changes the default behavior of > > git-send-email. This mode will simply read the alias files > > configured by > >

Re: [PATCH] check-ignore: correct documentation about output

+cc Jeff On Mon, Nov 16, 2015 at 6:13 AM, Dennis Kaarsemaker wrote: > Ping. Junio is on vacation, so Jeff is our interim maintainer, and it seems he isn't up to full power as Junio. :) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: [PATCH] Optimize usage of grep by passing -q

On Mon, Nov 16, 2015 at 10:43 PM, Stefan Beller wrote: > Instead of redirecting all grep output to /dev/null, we can just > pass in -q instead. This preserves the exit code behavior, but is faster. > As grep returns true if it finds at least one match, grep can exit promptly >

Re: [PATCH] Optimize usage of grep by passing -q

+cc Andrey Rybak, who I credit for finding the reasoning below (he sent to me privately, without cc'ing the list) On Mon, Nov 16, 2015 at 4:59 PM, Mikael Magnusson wrote: > On Mon, Nov 16, 2015 at 10:43 PM, Stefan Beller wrote: >> Instead of redirecting

[PATCH v1] blame: avoid checking if a file exists on the working tree if a revision is provided

If a file has been deleted/renamed, blame refused to display blame content even if the path provided does match an existing blob on said revision. $ git status On branch hide Changes not staged for commit: (use "git add/rm ..." to update what will be committed) (use "git checkout -- ..." to

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Sun, Nov 15, 2015 at 3:22 PM, Jacob Keller wrote: > Add an option "list-aliases" which changes the default behavior of > git-send-email. This mode will simply read the alias files configured by > sendemail.aliasesfile and sendemail.aliasfiletype and print a list of >

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Mon, Nov 16, 2015 at 6:50 PM, Eric Sunshine wrote: > Also, shouldn't --list-aliases (or --dump-aliases) be mutually > exclusive with many of the other options? New tests would check such > exclusivity as well. In fact, while I agree with Szeder that it makes sense to

[PATCH v2] blame: avoid checking if a file exists on the working tree if a revision is provided

If a file has been deleted/renamed, blame refused to display blame content even if the path provided does match an existing blob on said revision. $ git status On branch hide Changes not staged for commit: (use "git add/rm ..." to update what will be committed) (use "git checkout -- ..." to

Re: [PATCH v1] blame: avoid checking if a file exists on the working tree if a revision is provided

On Mon, Nov 16, 2015 at 7:07 PM, Edmundo Carmona Antoranz wrote: > - if (!file_exists(path)) > - die_errno("cannot stat path '%s'", path); Two things: 1 What I would love to do is check if revisions were provided. Something like: if

Re: [PATCH v1] blame: avoid checking if a file exists on the working tree if a revision is provided

Ok... I think I got how to check revisions / file existence after revisions have been set up. Sending next patch version On Mon, Nov 16, 2015 at 7:16 PM, Edmundo Carmona Antoranz wrote: > On Mon, Nov 16, 2015 at 7:07 PM, Edmundo Carmona Antoranz >

Re: [PATCH v2] blame: avoid checking if a file exists on the working tree if a revision is provided

On Mon, Nov 16, 2015 at 8:29 PM, Edmundo Carmona Antoranz wrote: > blame: avoid checking if a file exists on the working tree > if a revision is provided This subject is a bit long; try to keep it to about 72 characters or less. More importantly, though, it doesn't give us

Re: [PATCH 3/4] diff-highlight: match up lines before highlighting

On Tue, Nov 3, 2015 at 5:03 PM, Jeff King wrote: > Your is _much_ slower. I get: > > real0m25.538s > user0m25.420s > sys 0m0.120s > > for the old versus: > > real2m3.580s > user2m3.548s > sys 0m0.156s Thanks for investigating and trying it out.

Re: [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout

On 15/11/15 13:08, larsxschnei...@gmail.com wrote: From: Lars Schneider In rare cases kill/cleanup operations in tests fail. Retry these operations with a timeout to make the test less flaky. Should there be a sleep in that retry_until_success loop so that it

Re: [PATCH v5 4/6] git-p4: add p4d timeout in tests

On 15/11/15 13:08, larsxschnei...@gmail.com wrote: From: Lars Schneider In rare cases p4d seems to hang. This watchdog will kill the p4d process after 300s in any case. That means each individual git p4 test needs to finish before 300s or it will fail. Looks good to

Re: [PATCH v5 5/6] git-p4: add trap to kill p4d on test exit

On 15/11/15 13:08, larsxschnei...@gmail.com wrote: From: Lars Schneider Sometimes the "prove" test runner hangs on test exit because p4d is still running. Add a trap to always kill "p4d" on test exit. With this change, I've started seeing this when running the

Re: opening an editor from git-gui on a file

Am 16.11.2015 um 08:58 schrieb Adam GROSZER: > Hi there, > > Hopefully sending the question/idea to the right list... > > I'm missing the feature to open a (configurable) editor with the > currently selected file in git gui. > > E.g. Looking at > >

Re: opening an editor from git-gui on a file

Thank you! Works fine. Tho I don't find any docs/references for a hotkey... On 11/16/2015 11:38 AM, stefan.na...@atlas-elektronik.com wrote: Am 16.11.2015 um 08:58 schrieb Adam GROSZER: Hi there, Hopefully sending the question/idea to the right list... I'm missing the feature to open a

Re: [PATCH] allow hooks to ignore their standard input stream

Hi Junio, I believe we have finalized the discussion on this patch. Please apply On Fri, Nov 13, 2015 at 06:23:20PM -0500, Jeff King wrote: > > > +test_expect_success 'filling pipe buffer does not cause failure' ' > > + git push parent1 "refs/heads/b/*:refs/heads/b/*" && > > + test_cmp

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Tue, Nov 17, 2015 at 12:10:35AM +, Keller, Jacob E wrote: > On Mon, 2015-11-16 at 18:50 -0500, Eric Sunshine wrote: > > It should be possible to extract the alias within the shell itself > > without a separate process. For instance: > > > > read alias rest > > > > will leave the first