Re: [PATCH v2 0/6] Make "local" orthogonal to date format

On Tue, Sep 01, 2015 at 06:44:31PM -0400, Jeff King wrote: > [1] I do think the error message for "relative-local is nonsense" could > perhaps be more explanatory, but I couldn't come up with any better > wording. But if you have ideas, feel free to switch it. My only suggestion would be

Re: Git book figure bug

Hi Jesper, On 2015-09-02 09:45, Jesper Jørgensen wrote: > I am learning how git works, and is using the excellent book on the > official site. > I believe I have located a mistake in one of the images. > It is about Figure 3.17 on this page : >

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

Karthik Nayak writes: > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -163,9 +174,28 @@ static void quote_formatting(struct strbuf *s, const > char *str, int quote_style) > } > } > > +static void align_handler(struct ref_formatting_stack *stack) Perhaps name it

Git book figure bug

Hi, I am learning how git works, and is using the excellent book on the official site. I believe I have located a mistake in one of the images. It is about Figure 3.17 on this page : http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging As far as I understand it, the right

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

Karthik Nayak writes: > --- a/builtin/tag.c > +++ b/builtin/tag.c > @@ -185,6 +185,10 @@ static enum contains_result contains(struct commit > *candidate, > return contains_test(candidate, want); > } > > +/* > + * Currently modified and used in ref-filter as

Re: [PATCH v2 0/6] Make "local" orthogonal to date format

On Wed, Sep 02, 2015 at 08:48:26AM +0100, John Keeping wrote: > On Tue, Sep 01, 2015 at 06:44:31PM -0400, Jeff King wrote: > > [1] I do think the error message for "relative-local is nonsense" could > > perhaps be more explanatory, but I couldn't come up with any better > > wording. But

Re: Git book figure bug

On Wed, Sep 2, 2015 at 7:45 PM, Jesper Jørgensen wrote: > Hi, > > I am learning how git works, and is using the excellent book on the official > site. > I believe I have located a mistake in one of the images. > It is about Figure 3.17 on this page : >

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

Karthik Nayak writes: > +test_expect_success 'alignment with format quote' ' > + cat >expect <<-EOF && > + refname is ${sq} ${sq}\\${sq}${sq}master${sq}\\${sq}${sq} > ${sq}| > + refname is ${sq}

Re: [PATCH v15 11/13] tag.c: use 'ref-filter' APIs

Karthik Nayak writes: > + if (filter->lines) > + format = to_free = > xstrfmt("%%(align:15,left)%%(refname:short)%%(end) %%(contents:lines=%d)", > +filter->lines); > + else > + format =

Re: [PATCHv4 1/3] submodule: implement `list` as a builtin helper

Junio C Hamano writes: > Stefan Beller writes: > >> +static int module_list_compute(int argc, const char **argv, >> +const char *prefix, >> +struct pathspec *pathspec) >> +{ >> ... >> +for (i = 0;

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

On Wed, Sep 2, 2015 at 9:15 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote: >>> Karthik Nayak writes: >>> >> + die(_("format: `end`

Re: [PATCH v15 11/13] tag.c: use 'ref-filter' APIs

Matthieu Moy writes: > I actually found the other more readable, as it reads "display the > refname aligned on 15 columns, and then a space", FWIW, I too find the "15-col followed by a space" easier to understand. I was merely being curious when/why Karthik

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

Matthieu Moy writes: > Junio C Hamano writes: > >> Karthik Nayak writes: >> >>> On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote: Karthik Nayak writes: >>> +

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

Karthik Nayak writes: > On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote: >> Karthik Nayak writes: >> > + die(_("format: `end` atom used without a supporting atom")); Not a show-stopper, but we may

Re: GSoC 2015 is over

On Wed, Sep 2, 2015 at 12:55 AM, Matthieu Moy wrote: > I consider this GSoC as a great success and a pleasant experience. > Congratulation to Paul and Karthik, and a warm "thank you" to everybody > who contributed: administrators, mentors, reviewers, and obviously >

Re: GSoC 2015 is over

On Wed, Sep 2, 2015 at 1:43 AM, Karthik Nayak wrote: > On Tue, Sep 1, 2015 at 10:25 PM, Matthieu Moy > wrote: >> Hi, >> >> The Google Summer of Code 2015 is officially over. We had two students >> (Paul and Karthik), and both of them passed.

Re: [PATCH 2/2] date: make "local" orthogonal to date format

Jeff King writes: > + /* historical alias */ > + if (!strcmp(format, "local")) > + format = "default-local"; > + > + mode->type = parse_date_type(format, ); > + mode->local = 0; > + > + if (skip_prefix(p, "-local", )) { > + if

Re: GSoC 2015 is over

On Wed, Sep 2, 2015 at 10:58 AM, Junio C Hamano wrote: > Matthieu Moy writes: > >> I consider this GSoC as a great success and a pleasant experience. >> Congratulation to Paul and Karthik, and a warm "thank you" to everybody >> who contributed:

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

Junio C Hamano writes: > Karthik Nayak writes: > + } else if (skip_prefix(name, "align", )) { >>> >>> This looked as if you are willing to take %(align) in addition to >>> %(align:...), but... >>> + struct align

Re: [PATCH v2 2/6] date: make "local" orthogonal to date format

John Keeping writes: > diff --git a/Documentation/rev-list-options.txt > b/Documentation/rev-list-options.txt > index a9b808f..5d28133 100644 > --- a/Documentation/rev-list-options.txt > +++ b/Documentation/rev-list-options.txt > @@ -702,12 +702,16 @@

Re: [PATCH v15 11/13] tag.c: use 'ref-filter' APIs

Karthik Nayak writes: > + if (filter->lines) > + format = to_free = > xstrfmt("%%(align:15,left)%%(refname:short)%%(end) %%(contents:lines=%d)", > +filter->lines); I recall hearing that you were more in favor of

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

Junio C Hamano writes: > Karthik Nayak writes: > >> On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote: >>> Karthik Nayak writes: >>> >> + die(_("format: `end` atom used without a supporting

Re: [PATCH v15 11/13] tag.c: use 'ref-filter' APIs

Karthik Nayak writes: > On Wed, Sep 2, 2015 at 8:40 PM, Junio C Hamano wrote: >> Karthik Nayak writes: >> >>> + if (filter->lines) >>> + format = to_free = >>> xstrfmt("%%(align:15,left)%%(refname:short)%%(end)

Re: GSoC 2015 is over

Matthieu Moy writes: > I consider this GSoC as a great success and a pleasant experience. > Congratulation to Paul and Karthik, and a warm "thank you" to everybody > who contributed: administrators, mentors, reviewers, and obviously > Junio! (not to mention Google,

Re: [PATCH v2 0/6] Make "local" orthogonal to date format

Jeff King writes: > On Wed, Sep 02, 2015 at 08:48:26AM +0100, John Keeping wrote: > >> On Tue, Sep 01, 2015 at 06:44:31PM -0400, Jeff King wrote: >> > [1] I do think the error message for "relative-local is nonsense" could >> > perhaps be more explanatory, but I couldn't come

Re: [PATCH v15 11/13] tag.c: use 'ref-filter' APIs

On Wed, Sep 2, 2015 at 8:40 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> + if (filter->lines) >> + format = to_free = >> xstrfmt("%%(align:15,left)%%(refname:short)%%(end) %%(contents:lines=%d)", >> +

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

Karthik Nayak writes: > On Wed, Sep 2, 2015 at 2:15 PM, Matthieu Moy >>> @@ -754,6 +816,42 @@ static void populate_value(struct ref_array_item *ref) >>> else >>> v->s = " "; >>> continue; >>> +

Re: [PATCH v4] git-p4: add config git-p4.pathEncoding

larsxschnei...@gmail.com writes: > From: Lars Schneider > > Perforce keeps the encoding of a path as given by the originating OS. > Git expects paths encoded as UTF-8. Add a config to tell git-p4 what > encoding Perforce had used for the paths. This encoding is used to

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

Karthik Nayak writes: > On Wed, Sep 2, 2015 at 2:37 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> --- a/builtin/tag.c >>> +++ b/builtin/tag.c >>> @@ -185,6 +185,10 @@ static enum contains_result

Re: [PATCH v2 0/6] Make "local" orthogonal to date format

John Keeping writes: > In which case, should we just support it now? > > Normally I'd suggest banning controversial options on the basis that > it's easier in the future to allow something that was previously banned > than change the meaning of an options, but in this case I

Re: [PATCH] t7060: actually test "git diff-index --cached -M"

Matthieu Prat writes: > A test was designed for "git diff-index --cached -M" but the command is > run without the "-M" option (which makes the test essentially identical > to its preceding counterpart). Very true and it seems that it has been that way from the day these

Re: [PATCH v2 0/6] Make "local" orthogonal to date format

On Wed, Sep 02, 2015 at 08:16:59AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > On Wed, Sep 02, 2015 at 08:48:26AM +0100, John Keeping wrote: > > > >> On Tue, Sep 01, 2015 at 06:44:31PM -0400, Jeff King wrote: > >> > [1] I do think the error message for "relative-local

[PATCH/RFC] Pinning of submodules

Patch to make it possible to pin submodules so that they are not affected by the --remote option in "git submodule". Anders Ro (2): git-submodule.sh: pin submodule when branch name is '@' t7412: add test case for pinned submodules Documentation/git-submodule.txt | 3 +- git-submodule.sh

[PATCH 18/43] refs-be-files.c: add a backend method structure with transaction functions

From: Ronnie Sahlberg Add a ref structure for backend methods. Start by adding method pointers for the transaction functions. Add a function set_refs_backend to switch between backends. The files based backend is the default. Signed-off-by: Ronnie Sahlberg

[PATCH 01/43] refs.c: create a public version of verify_refname_available

From: Ronnie Sahlberg Create a public version of verify_refname_available that backends can provide. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 53 ++---

[PATCH 02/43] refs: make repack_without_refs and is_branch public

Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 7 --- refs.h | 13 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/refs.c b/refs.c index 76b05f1..9c29899 100644 --- a/refs.c +++ b/refs.c

[PATCH 20/43] refs-be-files.c: add methods for the ref iterators

From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 36 +--- refs.c | 47 +++ refs.h

[PATCH 21/43] refs-be-files.c: add method for for_each_reftype_...

Add method for for_each_reftype_fullpath. Signed-off-by: David Turner --- refs-be-files.c | 3 ++- refs.c | 5 + refs.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/refs-be-files.c b/refs-be-files.c index 19bf12b..85257b9

[PATCH 24/43] refs.h: document make refname_is_safe and add it to header

This function might be used by other refs backends Signed-off-by: David Turner --- refs.h | 11 +++ 1 file changed, 11 insertions(+) diff --git a/refs.h b/refs.h index 5542587..359e166 100644 --- a/refs.h +++ b/refs.h @@ -259,6 +259,17 @@ int

[PATCH 19/43] refs-be-files.c: add methods for misc ref operations

From: Ronnie Sahlberg Add ref backend methods for: resolve_ref_unsafe, verify_refname_available, pack_refs, peel_ref, create_symref, resolve_gitlink_ref. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner ---

Re: [PATCH 24/43] refs.h: document make refname_is_safe and add it to header

And, of course, as soon as I send these, I notice the bad signoff on about half of them, including this one :( Those probably got screwed up when I ended up losing my entire repo once when a test went wrong. Anyway, I went ahead and fixed them in my local version, so next rev they'll be fine.

[PATCH 37/43] refs: move some defines from refs-be-files.c to refs.h

This allows them to be used by other ref backends. Signed-off-by: David Turner --- refs-be-files.c | 24 refs.h | 24 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/refs-be-files.c

[PATCH 43/43] refs: tests for db backend

Add tests for the database backend. Signed-off-by: David Turner --- t/t1460-refs-be-db.sh| 1103 ++ t/t1470-refs-be-db-reflog.sh | 353 ++ 2 files changed, 1456 insertions(+) create mode 100755

[PATCH 23/43] refs.c: move refname_is_safe to the common code

This function does not contain any backend specific code so we move it to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner

[PATCH 29/43] refs.c: add methods for reflog

In the file-based backend, the reflog piggybacks on the ref lock. Since other backends won't have the same sort of ref lock, ref backends must also handle reflogs. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 21

[PATCH 31/43] initdb: move safe_create_dir into common code

In a moment, we'll create initdb functions for ref backends, and code from initdb that calls this function needs to move into the files backend. So this function needs to be public. Signed-off-by: David Turner --- builtin/init-db.c | 12 cache.h

[PATCH 36/43] run-command: track total number of commands run

Soon, the db refs backend will use this to restart read transactions after subcommands which might have modified the refs database. Signed-off-by: David Turner --- run-command.c | 2 ++ run-command.h | 1 + 2 files changed, 3 insertions(+) diff --git a/run-command.c

[PATCH 34/43] refs-be-files.c: add method to rename refs

We also have to make rename_ref_available public, since alternate backends for rename_ref will need it. Signed-off-by: David Turner --- refs-be-files.c | 19 ++- refs.c | 21 + refs.h | 4 3 files changed, 27

[PATCH 25/43] refs.c: move copy_msg to the common code

Rename copy_msg to copy_reflog_msg and make it public. Signed-off-by: David Turner --- refs-be-files.c | 28 +--- refs.c | 26 ++ refs.h | 2 ++ 3 files changed, 29 insertions(+), 27 deletions(-) diff

[PATCH 39/43] refs: break out a ref conflict check

Create new function verify_no_descendants, to hold one of the ref conflict checks used in verify_refname_available. Multiple backends will need this function, so it goes in the common code. Signed-off-by: David Turner --- refs-be-files.c | 33

[PATCH 42/43] refs: add LMDB refs backend

Add a database backend for refs using LMDB. This backend runs git for-each-ref about 30% faster than the files backend with fully-packed refs on a repo with ~120k refs. It's also about 4x faster than using fully-unpacked refs. In addition, and perhaps more importantly , it avoids case-conflict

[PATCH 10/43] refs.c: move warn_if_dangling_symref* to the common code

From: Ronnie Sahlberg These functions do not use any backend specific code so we move them to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 52

[PATCH 09/43] refs.c: move dwim and friend functions to the common refs code

From: Ronnie Sahlberg These functions do not contain any backend specific code so we move them to the common code and share across all backends. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 203

[PATCH 14/43] refs.c: move is_branch to the common code

From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 5 - refs.c | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/refs-be-files.c

[PATCH 13/43] refs.c: move check_refname_format to the common code

From: Ronnie Sahlberg This function does not contain any backend specific code so we move it to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 109

[PATCH 11/43] refs.c: move read_ref, read_ref_full and ref_exists to the common code

From: Ronnie Sahlberg These functions do not depend on the backend implementation so we move them to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 18 -- refs.c

[PATCH 28/43] refs.c: add ref backend init function

The file backend doesn't need this function, but other backends might. Signed-off-by: David Turner Signed-off-by: Ronnie Sahlberg --- refs-be-files.c | 1 + refs.c | 4 +++- refs.h | 4 +++- 3 files changed, 7 insertions(+), 2

[PATCH 00/43] refs lmdb backend

I think I've broken about all of the standalone stuff out, so here's the main enchilada. This series depends on at least the following topics in pu: dt/refs-bisection dt/refs-pseudo dt/reflog-tests kn/for-each-tag (patch 21 and corresponding bits of 42 depend on this; we could skip them, but I

[PATCH 08/43] refs.c: move the hidden refs functions to the common code

From: Ronnie Sahlberg Move the hidden refs functions to the refs.c file since these functions do not contain any backend specific code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 51

[PATCH 17/43] refs.c: move head_ref_namespaced to the common code

From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg --- refs-be-files.c | 15 --- refs.c | 15 +++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/refs-be-files.c b/refs-be-files.c index

[PATCH 22/43] refs-be-files.c: add do_for_each_per_worktree_ref

Alternate refs backends might still use files to store per-worktree refs. So the files backend's ref-loading infrastructure should be available to those backends, just for use on per-worktree refs. Add do_for_each_per_worktree_ref, which iterates over per-worktree refs. Signed-off-by: David

[PATCH 06/43] refs.c: move delete_ref and delete_refs to the common code

From: Ronnie Sahlberg Move delete_pseudoref, delete_ref() and delete_refs() to the refs.c file since these functions do not contain any backend specific code. Based on a patch by Ronnie Sahlberg. Signed-off-by: David Turner Signed-off-by: Ronnie

[PATCH 15/43] refs.c: move prettify_refname to the common code

From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg --- refs-be-files.c | 9 - refs.c | 9 + 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/refs-be-files.c b/refs-be-files.c index a346629..6b5b290 100644 ---

[PATCH 26/43] refs.c: move peel_object to the common code

This function does not contain any backend specific code so we move it to the common code. Signed-off-by: David Turner --- refs-be-files.c | 53 - refs.c | 31 +++ refs.h

[PATCH 16/43] refs.c: move ref iterators to the common code

From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg --- refs-be-files.c | 83 - refs.c | 81 +++ 2 files changed, 81 insertions(+), 83

[PATCH 04/43] refs.c: add a new refs.c file to hold all common refs code

From: Ronnie Sahlberg Create a new refs.c file that will be used to hold all the refs code that is backend agnostic and will be shared across all backends. Signed-off-by: Ronnie Sahlberg --- refs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git

[PATCH 35/43] refs-be-files.c: add method to expire reflogs

Signed-off-by: David Turner --- refs-be-files.c | 3 ++- refs.h | 7 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/refs-be-files.c b/refs-be-files.c index 5170c5c..71c39ca 100644 --- a/refs-be-files.c +++ b/refs-be-files.c @@ -3607,7

[PATCH 41/43] refs: add register_refs_backend

Add register_refs_backend, to allow refs backends to be registered. Signed-off-by: David Turner --- refs.c | 6 ++ refs.h | 1 + 2 files changed, 7 insertions(+) diff --git a/refs.c b/refs.c index 3a2cafb..9bdd51f 100644 --- a/refs.c +++ b/refs.c @@ -18,6 +18,12

[PATCH 40/43] refs: allow ref backend to be set for clone

Add a new option, --refs-backend-type, to allow the ref backend type to be set on new clones. Submodules must use the same ref backend as the parent repository, so we also pass the --refs-backend-type option option when cloning submodules. Signed-off-by: David Turner

[PATCH 33/43] refs.c: make struct ref_transaction generic

Alternate ref backends might need different data for transactions. Make struct ref_transaction an empty struct, and let backends define their own structs which extend it. Signed-off-by: David Turner --- refs-be-files.c | 20 +--- refs.h | 8

[PATCH 38/43] refs: make some files backend functions public

Because HEAD and stash are per-worktree, other backends need to go through the files backend to manage these refs and their reflogs. To enable this, we make some files backend functions public. Signed-off-by: David Turner --- refs-be-files.c | 34

[PATCH 32/43] refs.c: add method for initializing refs db

Alternate refs backends might not need refs/heads and so on, so we make ref db initialization part of the backend. Signed-off-by: David Turner --- builtin/init-db.c | 14 -- refs-be-files.c | 17 + refs.c| 5 + refs.h

[PATCH 27/43] refs.c: move should_autocreate_reflog to common code

Signed-off-by: David Turner --- refs-be-files.c | 10 -- refs.c | 10 ++ refs.h | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/refs-be-files.c b/refs-be-files.c index 657b58f..3138624 100644 ---

[PATCH 30/43] refs.c: add method for initial ref transaction commit

Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 5 +++-- refs.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/refs-be-files.c b/refs-be-files.c index 1180799..c49d44e 100644 ---

[PATCH 12/43] refs.c: move resolve_refdup to common

From: Ronnie Sahlberg This function can be shared across all refs backends so move it to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 7 --- refs.c | 7 +++ 2

[PATCH 05/43] refs.c: move update_ref to refs.c

From: Ronnie Sahlberg Move update_ref() to the refs.c file since this function does not contain any backend specific code. Move the ref classifier functions as well, since update_ref depends on them. Based on Ronnie Sahlberg's patch Signed-off-by: Ronnie Sahlberg

[PATCH 07/43] refs.c: move read_ref_at to the common refs file

From: Ronnie Sahlberg Move read_ref_at() to the refs.c file since this function does not contain any backend specific code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 118

Re: [PATCH v4] git-p4: add config git-p4.pathEncoding

On Wednesday, September 2, 2015, wrote: > Perforce keeps the encoding of a path as given by the originating OS. > Git expects paths encoded as UTF-8. Add a config to tell git-p4 what > encoding Perforce had used for the paths. This encoding is used to > transcode the

[PATCH] t7060: actually test "git diff-index --cached -M"

A test was designed for "git diff-index --cached -M" but the command is run without the "-M" option (which makes the test essentially identical to its preceding counterpart). Give the command the option it deserves and the test a raison d'être. Signed-off-by: Matthieu Prat

Re: [PATCH] rerere: release lockfile in non-writing functions

Jeff King writes: > There's a bug in builtin/am.c in which we take a lock on > MERGE_RR recursively. But rather than fix am.c, this patch > fixes the confusing interface from rerere.c that caused the > bug. Read on for the gory details. > > The setup_rerere() function both reads

Re: [PATCH v2 0/6] Make "local" orthogonal to date format

John Keeping writes: > On Wed, Sep 02, 2015 at 08:16:59AM -0700, Junio C Hamano wrote: >> Jeff King writes: >> >> > I guess "relative dates do not depend on timezones, so -local is >> > meaningless" would be the closest thing. > > The discussion about

[PATCH v5] git-p4: add config git-p4.pathEncoding

From: Lars Schneider Perforce keeps the encoding of a path as given by the originating OS. Git expects paths encoded as UTF-8. Add a config to tell git-p4 what encoding Perforce had used for the paths. This encoding is used to transcode the paths to UTF-8. As an

[PATCH v5] git-p4: add config git-p4.pathEncoding

From: Lars Schneider Diff to v4: * add verbose output * reword help text * remove comment how to generate encoded sequence * use ascii characters in encoded sequence where possible * wrap 'cd' in TC in a subshell Thanks to Eric, Torsten, and Junio for feedback!

Re: [PATCH v2 0/6] Make "local" orthogonal to date format

On Wed, Sep 02, 2015 at 01:11:35PM -0700, Junio C Hamano wrote: > John Keeping writes: > > OTOH, I don't think there's any disagreement about what "relative-local" > > and "raw-local" would output were they supported, just whether they are > > useful. There doesn't seem to be

[ANNOUNCE] Git v2.6.0-rc0

An early preview release Git v2.6.0-rc0 is now available for testing at the usual places. It is comprised of 406 non-merge commits since v2.5.0, contributed by 50 people, 12 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The

Re: [git-for-windows] Re: Git for Windows 2.5.1 is out

On Wed, 2 Sep 2015, Aaron Bird wrote: > I am running windows 8.1. Every time I try and open git Bash I get an > unexpected kernal mode trap error and computer instantly shuts down. For lurkers, Aaron also reported this bug at https://github.com/git-for-windows/git/issues/348 and we are eagerly

Re: [PATCH v2 0/6] Make "local" orthogonal to date format

On Wed, Sep 02, 2015 at 01:29:08PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > In which case, should we just support it now? > > > > Normally I'd suggest banning controversial options on the basis that > > it's easier in the future to allow something that was

Re: [PATCH v5] git-p4: add config git-p4.pathEncoding

On 2 September 2015 at 21:39, wrote: > From: Lars Schneider > > Perforce keeps the encoding of a path as given by the originating OS. > Git expects paths encoded as UTF-8. Add a config to tell git-p4 what > encoding Perforce had used for the

Re: GSoC 2015 is over

Hi, On Wed, 2 Sep 2015, Paul Tan wrote: > On Wed, Sep 2, 2015 at 12:55 AM, Matthieu Moy > wrote: > > I consider this GSoC as a great success and a pleasant experience. > > Congratulation to Paul and Karthik, and a warm "thank you" to everybody > > who contributed:

Re: [PATCH 2/2] date: make "local" orthogonal to date format

On Wed, Sep 02, 2015 at 10:41:34AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > + /* historical alias */ > > + if (!strcmp(format, "local")) > > + format = "default-local"; > > + > > + mode->type = parse_date_type(format, ); > > + mode->local = 0; > >

[PATCHv5 1/3] submodule: Reimplement `module_list` shell function in C

Most of the submodule operations work on a set of submodules. Calculating and using this set is usually done via: module_list "$@" | { while read mode sha1 stage sm_path do # the actual operation done } Currently the function

[PATCHv5 0/3] submodule--helper: Have some refactoring only patches first

I finished the refactoring and picked up suggestions from Eric and Junio. Stefan Beller (3): submodule: Reimplement `module_list` shell function in C submodule: Reimplement `module_name` shell function in C submodule: Reimplement `module_clone` shell function in C .gitignore

[PATCHv5 3/3] submodule: Reimplement `module_clone` shell function in C

This reimplements the helper function `module_clone` in shell in C as `clone`. This functionality is needed for converting `git submodule update` later on, which we want to add threading to. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 136

[PATCHv5 2/3] submodule: Reimplement `module_name` shell function in C

This implements the helper `name` in C instead of shell, yielding a nice performance boost. Before this patch, I measured a time (best out of three): $ time ./t7400-submodule-basic.sh >/dev/null real0m11.066s user0m3.348s sys 0m8.534s With this patch applied I

Re: [PATCH 2/2] date: make "local" orthogonal to date format

On Wed, Sep 02, 2015 at 05:30:14PM -0400, Jeff King wrote: > On Wed, Sep 02, 2015 at 10:41:34AM -0700, Junio C Hamano wrote: > > > Jeff King writes: > > > > > + /* historical alias */ > > > + if (!strcmp(format, "local")) > > > + format = "default-local"; > > > + > > > +

Do you plan to release 2.5.2 any time soon?

Hi Junio, I have a couple of fixes lined up for bugs in Git for Windows 2.5.1. Do you plan to release 2.5.2 any time soon? If yes, I would hold off, otherwise I will just do a Git for Windows 2.5.1 (Rel 2). Thanks, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

On Wed, Sep 2, 2015 at 2:49 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> We have an `at_end` function for each element of the stack which is to >> be called when the `end` atom is encountered. Using this we implement >> the aling_handler() for

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

On Wed, Sep 2, 2015 at 2:11 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> +test_expect_success 'alignment with format quote' ' >> + cat >expect <<-EOF && >> + refname is ${sq} ${sq}\\${sq}${sq}master${sq}\\${sq}${sq}

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

On Wed, Sep 2, 2015 at 2:15 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> --- a/ref-filter.c >> +++ b/ref-filter.c > >> @@ -163,9 +174,28 @@ static void quote_formatting(struct strbuf *s, const >> char *str, int quote_style) >> }

Re: [PATCH v15 06/13] ref-filter: add option to filter out tags, branches and remotes

On Wed, Sep 2, 2015 at 9:45 AM, Junio C Hamano wrote: > Karthik Nayak writes: > + if (filter->kind == FILTER_REFS_BRANCHES) + ret = for_each_fullref_in("refs/heads/", ref_filter_handler, _cbdata, broken); +

  1   2   >