Re: [PATCH] rebase --preserve-merges keeps empty merge commits

On Fri, Feb 1, 2013 at 1:05 PM, Phil Hord wrote: > > This is probably right, but it is not exactly the case that caused my itch. > I think my branch looked like [...] That also makes sense. I'll add tests for both cases. Your patch makes both of them pass. >> # a---b---c >> # \ \ >> #

Re: [PATCH 4/6] introduce a commit metapack

On Fri, Feb 1, 2013 at 5:15 PM, Jeff King wrote: > The short-sha1 is a clever idea. Looks like it saves us on the order of > 4MB for linux-2.6 (versus the full 20-byte sha1). Not as big as the > savings we get from dropping the other 3 sha1's to uint32_t, but still > not bad. We could save anothe

Re: [PATCH/RFC 0/6] commit caching

On Fri, Feb 1, 2013 at 1:11 AM, Jeff King wrote: > On Thu, Jan 31, 2013 at 09:14:26AM -0800, Shawn O. Pearce wrote: > >> On Tue, Jan 29, 2013 at 1:14 AM, Jeff King wrote: >> > Coupled with using compression level 0 for trees (which do not compress >> > well at all, and yield only a 2% increase in

Re: [PATCH 0/2] optimizing pack access on "read only" fetch repos

On Fri, Feb 1, 2013 at 1:14 AM, Jeff King wrote: > On Thu, Jan 31, 2013 at 08:47:37AM -0800, Shawn O. Pearce wrote: > >> >> - System resource cost we incur by having to keep 50 file >> >>descriptors open and maintaining 50 mmap windows will reduce by >> >>50 fold. >> > >> > I wonder how m

Re: [PATCH] git-send-email: add ~/.authinfo parsing

On Thu, 31 Jan 2013 14:38:45 -0500 Jeff King wrote: JK> On Thu, Jan 31, 2013 at 10:23:51AM -0500, Ted Zlatanov wrote: >> Jeff, is there a way for git-credential to currently support >> authinfo/netrc parsing? I assume that's the right way, instead of using >> Michal's proposal to parse internal

Re: [PATCH 4/6] introduce a commit metapack

Jeff King writes: > On Thu, Jan 31, 2013 at 09:03:26AM -0800, Shawn O. Pearce wrote: > ... >> If we are going to change the index to support extension sections and >> I have to modify JGit to grok this new format, it needs to be index v3 >> not index v2. If we are making index v3 we should just p

[PATCH] Handle path completion and colon for tcsh script

Recent enhancements to git-completion.bash provide intelligent path completion for git commands. Such completions do not add the '/' at the end of directories for recent versions of bash. However, the '/' is needed by tcsh, so we must tell the bash script to append it by using a compatibility met

Re: [PATCH] Handle path completion and colon for tcsh script

Marc Khouzam writes: > Recent enhancements to git-completion.bash provide > intelligent path completion for git commands. Such > completions do not add the '/' at the end of directories > for recent versions of bash. > ... > Here is the update for tcsh completion which is needed to handle > the

[PATCH] Honor configure's htmldir switch

Honor autoconf's --htmldir switch. This allows relocating HTML docs straight from the configure script. Signed-off-by: Christoph J. Thompson --- config.mak.in | 1 + 1 file changed, 1 insertion(+) diff --git a/config.mak.in b/config.mak.in index e8a9bb4..d7c49cd 100644 --- a/config.mak.in +++

Re: [PATCH] Honor configure's htmldir switch

"Christoph J. Thompson" writes: > Honor autoconf's --htmldir switch. This allows relocating HTML docs > straight from the configure script. > > > Signed-off-by: Christoph J. Thompson > --- > config.mak.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/config.mak.in b/config.mak.in >

[RFC/PATCH] config.mak.in: remove unused definitions

When 5566771 (autoconf: Use autoconf to write installation directories to config.mak.autogen, 2006-07-03) introduced support for autoconf generated config.mak file, it added a few "export", in addition to definitions of srcdir and VPATH. These "export" logically does not belong there. The common

Re: [PATCH] Honor configure's htmldir switch

Christoph Thompson writes: > Will the --htmldir switch still work by exporting mandir and htmldir from > the Makefile instead of > config.mak.in ? It should not make a difference where you export them from. Lets see... -- cut here -- >8 -- cut here -- $ cat >Makefile <<\EOF # The default targ

Re: [PATCH] Honor configure's htmldir switch

Christoph Thompson writes: [administrivia: why do you keep dropping git@vger from Cc???] > I was under the impression that configure passed on the value of it's > --htmldir switch by doing > some substitution work like the following : > > sed 's|@htmldir@|$(htmldir)|g' config.mak.in > config.mak

Re: What's cooking in git.git (Feb 2013, #01; Fri, 1)

Junio C Hamano writes: Regarding these two topics > * da/mergetool-docs (2013-01-30) 7 commits > - doc: generate a list of valid merge tools > - mergetool--lib: list user configured tools in '--tool-help' > - fixup! doc: generate a list of valid merge tools > - fixup! mergetool--lib: add

[PATCH v2] branch: show rebase/bisect info when possible instead of "(no branch)"

This prints more helpful info when HEAD is detached: is it detached because of bisect or rebase? What is the original branch name in those cases? Signed-off-by: Nguyễn Thái Ngọc Duy --- - Incorporate Jonathan's version of checking - Show original branch name, e.g. "(rebasing foo)", when possi

[PATCH v3] status: show the branch name if possible in in-progress info

Signed-off-by: Nguyễn Thái Ngọc Duy --- - avoid hardcoding SHA-1 in t7512 - I did not act on Junio's --format=%s idea because frankly I don't care much about the "on 'xxx'" part. It was Matthieu's idea and he did not make any comments on --format=%s t/t7512-status-help.sh | 87 ++

Re: Getting started contributing.

adamfraser writes: > I would like to start contributing to git and am looking for a small project > idea to get started with. On the Small Project Ideas wiki > site there is a > suggestion for adding a 'git rebase --status' command tha

Re: Getting started contributing.

adamfraser writes: > I've done a little searching and > haven't been able to find an official bug tracker for git is there somewhere > I can find some bugs to help fix? You came to the right place. A new bug or regression is reported to this list, and it often is fixed (or often diagnosed as pe