[PATCH] api-strbuf.txt minor typos

2014-06-08 Thread Jeremiah Mahler
Fixed some minor typos in api-strbuf.txt: 'A' instead of 'An', 'have' instead of 'has', a overlong line, and 'another' instead of 'an other'. Signed-off-by: Jeremiah Mahler --- Documentation/technical/api-strbuf.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/D

Re: [PATCH v3 1/4] replace: add --graft option

2014-06-08 Thread Jeff King
On Sun, Jun 08, 2014 at 08:04:39AM -0400, Jeff King wrote: > diff --git a/builtin/blame.c b/builtin/blame.c > index a52a279..1945ea4 100644 > --- a/builtin/blame.c > +++ b/builtin/blame.c > @@ -2313,7 +2313,7 @@ static struct commit *fake_working_tree_commit(struct > diff_options *opt, >

Re: [PATCH v3 1/4] replace: add --graft option

2014-06-08 Thread Jeff King
On Sun, Jun 08, 2014 at 07:23:33AM -0400, Jeff King wrote: > 4. Keep a static commit_slab that points to the length for each parsed > commit. We pay the same memory cost as (2), but as it's not part of > the struct, the cache effects are minimized. I think I favor this solution, which

Re: [PATCH v3 1/4] replace: add --graft option

2014-06-08 Thread Jeff King
On Sun, Jun 08, 2014 at 08:49:45AM +0200, Christian Couder wrote: > On Fri, Jun 6, 2014 at 5:44 PM, Christian Couder > wrote: > > > > /* find existing parents */ > > strbuf_addstr(&buf, commit->buffer); > > Unfortunately, it looks like the above will not work if the commit->buffe

Re: [PATCH v5] Add an explicit GIT_DIR to the list of excludes

2014-06-08 Thread Duy Nguyen
On Thu, Jun 5, 2014 at 3:15 AM, Pasha Bolokhov wrote: > + /* only add it if GIT_DIR does not end with '.git' or '/.git' */ > + if (len < 4 || strcmp(n_git + len - 4, ".git") || > + (len > 4 && n_git[len - 5] != '/')) { Hmm.. should we exclude "foobar.git" as well? -- Duy --

[PATCH] Fix "t0001: test git init when run via an alias"

2014-06-08 Thread Nguyễn Thái Ngọc Duy
Commit 4ad8332 (t0001: test git init when run via an alias - 2010-11-26) noted breakages when running init via alias. The problem is for alias to be used, $GIT_DIR must be searched, but 'init' and 'clone' are not happy with that. So we start a new process like an external command, with clean enviro

Re: [PATCH 2/5] implement submodule config cache for lookup of submodule names

2014-06-08 Thread Eric Sunshine
On Thu, Jun 5, 2014 at 2:07 AM, Heiko Voigt wrote: > This submodule configuration cache allows us to lazily read .gitmodules > configurations by commit into a runtime cache which can then be used to > easily lookup values from it. Currently only the values for path or name > are stored but it can

Re: [PATCH 1/2] refs.c: write updates to packed refs when a transaction has more than one ref

2014-06-08 Thread Eric Sunshine
On Thu, Jun 5, 2014 at 7:26 PM, Ronnie Sahlberg wrote: > When we are updating more than one single ref, i.e. not a commit, then > write the updated refs directly to the packed refs file instead of writing > them as loose refs. > > Change clone to use a transaction instead of using the pacekd refs

Re: [PATCH] completion: Handle '!f() { ... }; f' aliases

2014-06-08 Thread Eric Sunshine
On Sat, Jun 7, 2014 at 10:10 AM, Steffen Prohaska wrote: > '!f() { ... }; f' is a recommended pattern to declare more complex > aliases (see git wiki [1]). This commit teaches the completion to > handle them. > > When determining which completion to use for an alias, the opening brace > is now ig