Re: [PATCH v5 3/6] command-list.txt: group common commands by theme

2015-05-10 Thread Eric Sunshine
On Sat, May 9, 2015 at 1:17 PM, Sébastien Guimmara wrote: > Declare groups for common commands in the [common] block, > followed by group names and descriptions: > > [common] > init start a working area (see also: git help tutorial) > worktree work on the current change (se

Re: [PATCH v2 0/8] Fix atomicity and avoid fd exhaustion in ref transactions

2015-05-10 Thread Junio C Hamano
Michael Haggerty writes: > The following other branches, also from my GitHub repo, might be > useful: > > * 'write-refs-sooner-2.3' -- suggested merge of the change to 'maint'. > > * 'write-refs-sooner-master' -- suggested merge of the change to > 'master'. > > * 'write-refs-sooner-rebased-2.3'

Re: [PATCH] bisect: print abbrev sha1 for first bad commit

2015-05-10 Thread Trevor Saunders
On Sat, May 09, 2015 at 12:07:04AM -0400, Jeff King wrote: > On Fri, May 08, 2015 at 10:03:41PM -0400, Trevor Saunders wrote: > > > On Fri, May 08, 2015 at 05:29:42PM -0700, Stefan Beller wrote: > > > On Fri, May 8, 2015 at 4:46 PM, Trevor Saunders > > > wrote: > > > > its rather silly especiall

Re: git difftool and proper path escaping on windows

2015-05-10 Thread Philip Oakley
From: "David Aguilar" On May 8, 2015 10:31:05 AM PDT, Phil Susi wrote: I'm trying to have git difftool run winmerge to compare files, but it seems to be doing something silly with path translation. My first attempt was: git difftool -x /c/Program\ Files\ \(x86\)/WinMerge/WinMergeU.exe To wh

Re: git difftool and proper path escaping on windows

2015-05-10 Thread David Aguilar
On May 8, 2015 10:31:05 AM PDT, Phil Susi wrote: >I'm trying to have git difftool run winmerge to compare files, but it >seems to be doing something silly with path translation. My first >attempt was: > >git difftool -x /c/Program\ Files\ \(x86\)/WinMerge/WinMergeU.exe > >To which it responded:

[PATCH v6 6/7] clean: improve performance when removing lots of directories

2015-05-10 Thread Erik Elfström
"git clean" uses resolve_gitlink_ref() to check for the presence of nested git repositories, but it has the drawback of creating a ref_cache entry for every directory that should potentially be cleaned. The linear search through the ref_cache list causes a massive performance hit for large number o

Re: Multiple push remotes via aliases

2015-05-10 Thread Junio C Hamano
"brian m. carlson" writes: > I recently discovered that it was possible to specify multiple push URLs > for a remote. This is useful for me because some of my projects live > both on GitHub and on my own server, and some live only one place or the > other. > > One feature that I'm looking for, h

Re: [PATCH v3 2/3] sha1_name: get_sha1_with_context learns to follow symlinks

2015-05-10 Thread Junio C Hamano
dtur...@twopensource.com writes: > -#define GET_SHA1_QUIETLY01 > -#define GET_SHA1_COMMIT 02 > -#define GET_SHA1_COMMITTISH 04 > -#define GET_SHA1_TREE 010 > -#define GET_SHA1_TREEISH 020 > -#define GET_SHA1_BLOB 040 > -#define GET_SHA1_ONLY_TO_DIE

Re: [PATCH v2 09/12] t7406: use "git pull" instead of "git pull --rebase"

2015-05-10 Thread Paul Tan
Hi Junio, On Fri, May 8, 2015 at 4:15 AM, Junio C Hamano wrote: > I do not think touching this test which does not have anything to do > with "git pull" in your series is sensible at all, and you shouldn't > flip test_expect_success temporarily to _expect_failure, if that is > what you have in mi