FeatureRequest: Build improvements for Windows

2015-07-25 Thread Dangling Pointer
Hello, In my understanding, the ratio between the mere consumers of git on Windows vs. people who compile git for Windows is 100,000 : 1. If there is a breaking change in the workflow of the latter set, who use Visual Studio to build git from source, I assume that is doable given a good reason

Re: [PATCH v4 01/10] ref-filter: add option to align atoms to the left

2015-07-25 Thread Karthik Nayak
On Sun, Jul 26, 2015 at 11:28 AM, Eric Sunshine wrote: > On Sun, Jul 26, 2015 at 12:36 AM, Karthik Nayak wrote: >> On Sun, Jul 26, 2015 at 9:38 AM, Eric Sunshine >> wrote: >>> Also, it is helpful to reviewers if you include an interdiff at the >>> bottom of your cover letter showing the changes

Re: [PATCH v4 01/10] ref-filter: add option to align atoms to the left

2015-07-25 Thread Eric Sunshine
On Sun, Jul 26, 2015 at 12:36 AM, Karthik Nayak wrote: > On Sun, Jul 26, 2015 at 9:38 AM, Eric Sunshine > wrote: >> Also, it is helpful to reviewers if you include an interdiff at the >> bottom of your cover letter showing the changes from one version to >> another. You can generate an interdiff

Re: [PATCH v4 02/10] ref-filter: make the 'color' use ref_formatting_state

2015-07-25 Thread Karthik Nayak
On Sun, Jul 26, 2015 at 9:42 AM, Eric Sunshine wrote: > > Should 'color' should be declared 'char *' rather than 'const char *'? > It's always assigned via xstrdup(), and if declared 'char *', you > wouldn't have to cast away the 'const' when freeing it. > yes, will change. > > While reviewing p

Re: "git am" and then "git am -3" regression?

2015-07-25 Thread Jeff King
On Sun, Jul 26, 2015 at 01:03:59PM +0800, Paul Tan wrote: > > Ideally the code would just be ordered as: > > > > - load config from git-config > > > > - override that with defaults inherited from a previous run > > > > - override that with command-line parsing > > So I'm more in favor of th

Re: [PATCH v4 04/10] ref-filter: support printing N lines from tag annotation

2015-07-25 Thread Karthik Nayak
On Sun, Jul 26, 2015 at 10:16 AM, Eric Sunshine wrote: > On Fri, Jul 24, 2015 at 3:04 PM, Karthik Nayak wrote: >> From: Karthik Nayak >> >> In 'tag.c' we can print N lines from the annotation of the tag using >> the '-n' option. Copy code from 'tag.c' to 'ref-filter' and >> modify 'ref-filter' t

Re: [PATCH v4 06/10] ref-filter: add option to match literal pattern

2015-07-25 Thread Eric Sunshine
On Fri, Jul 24, 2015 at 3:04 PM, Karthik Nayak wrote: > Since 'ref-filter' only has an option to match path names add an > option for plain fnmatch pattern-matching. > > This is to support the pattern matching options which are used in `git > tag -l` and `git branch -l` where we can match patterns

Re: [PATCH v4 05/10] ref-filter: add support to sort by version

2015-07-25 Thread Karthik Nayak
On Sun, Jul 26, 2015 at 4:10 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> @@ -1180,19 +1181,17 @@ static int cmp_ref_sorting(struct ref_sorting *s, >> struct ref_array_item *a, stru >> >> get_ref_atom_value(&state, a, s->atom, &va); >> get_ref_atom_value(&state, b, s->atom,

Re: "git am" and then "git am -3" regression?

2015-07-25 Thread Paul Tan
On Sat, Jul 25, 2015 at 2:09 AM, Jeff King wrote: > Yeah, I think this hunk is to blame (though I just read the code and did not > test): > > @@ -658,6 +665,8 @@ fi > if test "$(cat "$dotest/threeway")" = t > then > threeway=t > +else > + threeway=f > fi > > It comes after the com

Re: [PATCH v4 04/10] ref-filter: support printing N lines from tag annotation

2015-07-25 Thread Eric Sunshine
On Fri, Jul 24, 2015 at 3:04 PM, Karthik Nayak wrote: > From: Karthik Nayak > > In 'tag.c' we can print N lines from the annotation of the tag using > the '-n' option. Copy code from 'tag.c' to 'ref-filter' and > modify 'ref-filter' to support printing of N lines from the annotation > of tags. >

Re: [PATCH v4 01/10] ref-filter: add option to align atoms to the left

2015-07-25 Thread Karthik Nayak
On Sun, Jul 26, 2015 at 9:38 AM, Eric Sunshine wrote: > On Fri, Jul 24, 2015 at 3:04 PM, Karthik Nayak wrote: >> Add a new atom "align" and support %(align:X) where X is a number. >> This will align the preceeding atom value to the left followed by > > Do you mean "succeeding" or "following" or "

Re: [PATCH v4 02/10] ref-filter: make the 'color' use ref_formatting_state

2015-07-25 Thread Eric Sunshine
On Sat, Jul 25, 2015 at 12:15 AM, Karthik Nayak wrote: > On Sat, Jul 25, 2015 at 3:16 AM, Junio C Hamano wrote: >> Karthik Nayak writes: >>> Make color which was considered as an atom, to use >>> ref_formatting_state and act as a pseudo atom. This allows >>> interchangeability between 'align' an

Re: [PATCH v4 02/10] ref-filter: make the 'color' use ref_formatting_state

2015-07-25 Thread Eric Sunshine
On Fri, Jul 24, 2015 at 3:04 PM, Karthik Nayak wrote: > Make color which was considered as an atom, to use > ref_formatting_state and act as a pseudo atom. This allows > interchangeability between 'align' and 'color'. > > Signed-off-by: Karthik Nayak > --- > diff --git a/ref-filter.c b/ref-filter

Re: [PATCH v4 01/10] ref-filter: add option to align atoms to the left

2015-07-25 Thread Eric Sunshine
On Fri, Jul 24, 2015 at 3:04 PM, Karthik Nayak wrote: > Add a new atom "align" and support %(align:X) where X is a number. > This will align the preceeding atom value to the left followed by Do you mean "succeeding" or "following" or "next" (or something) rather than "preceding"? > spaces for a

Re: Question about git filter-branch with signed commits

2015-07-25 Thread Adam Liter
I'm trying to clean up the commit history of a git repository by removing certain files. The repository contains signed commits, and when I try to use git filter-branch, the PGP signature is converted to the first line of the commit message. It should be possible to craft a filter that remove

Re: Question about git filter-branch with signed commits

2015-07-25 Thread Jacob Keller
On Sat, Jul 25, 2015 at 1:17 PM, Adam Liter wrote: > Hello, > > I'm trying to clean up the commit history of a git repository by removing > certain files. The repository contains signed commits, and when I try to use > git filter-branch, the PGP signature is converted to the first line of the > co

Re: [RFC/PATCH] log: add log.firstparent option

2015-07-25 Thread Jacob Keller
On Sat, Jul 25, 2015 at 10:41 AM, Junio C Hamano wrote: > Jeff King writes: > >> On Fri, Jul 24, 2015 at 08:07:49AM -0700, Junio C Hamano wrote: >> >>> Yeah, you actually convinced me reasonably well that it would >>> happen. I'd never use it myself. If people want to shoot >>> themselves in th

Re: [PATCH v4 05/10] ref-filter: add support to sort by version

2015-07-25 Thread Junio C Hamano
Karthik Nayak writes: > @@ -1180,19 +1181,17 @@ static int cmp_ref_sorting(struct ref_sorting *s, > struct ref_array_item *a, stru > > get_ref_atom_value(&state, a, s->atom, &va); > get_ref_atom_value(&state, b, s->atom, &vb); > - switch (cmp_type) { > - case FIELD_STR: > +

You can upload now your invited paper

2015-07-25 Thread Olga Nikolova
Dear Professor You can upload now your invited paper for our conference in Malta, August 17-19: www. wseas. org until July 27, 2015 OR for our conference in Seoul, South Korea, September 5-7, 2015 until August 20, 2015. URL www. wseas. org Invited Speakers will have also publication in one of o

Question about git filter-branch with signed commits

2015-07-25 Thread Adam Liter
Hello, I'm trying to clean up the commit history of a git repository by removing certain files. The repository contains signed commits, and when I try to use git filter-branch, the PGP signature is converted to the first line of the commit message. Is this the expected behavior? If so, is th

Re: How to organize multiple small reusable components with Git?

2015-07-25 Thread Adam Kurkiewicz
Hi Bing, I don't think the approach you're outlining in your most recent e-mail is going to work particularly well for you. See my replies in-line. I have devised a solution that should work much better for you, it's a tiny bash script and a set of naming conventions for repository branches. I've

Re: [RFC/PATCH] log: add log.firstparent option

2015-07-25 Thread Junio C Hamano
Jeff King writes: > On Fri, Jul 24, 2015 at 08:07:49AM -0700, Junio C Hamano wrote: > >> Yeah, you actually convinced me reasonably well that it would >> happen. I'd never use it myself. If people want to shoot >> themselves in the foot, be my guest ;-) >> >> Perhaps we should drop this, and g

Re: [RFC/PATCH] log: add log.firstparent option

2015-07-25 Thread Junio C Hamano
Jeff King writes: > This works for "format-patch -s". But I guess that leaves open the > question of "commit --signoff". It should not matter when making a > commit new (after all, you have not yet had a chance to put the "---" > in). But something like "git commit --amend --signoff" might want t