Re: Which branch(es) contain certain commits? (was Re: (unknown))

2015-08-16 Thread Ivan Chernyavsky
15.08.2015, 12:19, "Duy Nguyen" : > > Probably because nobody is interested and steps up to do it. The lack > of response to you mail is a sign. Maybe you can try make a patch? I > imagine it would not be so different from current --contains code, but > this time we need to look into commits, not

Re: [PATCH v11 03/13] ref-filter: introduce ref_formatting_state

2015-08-16 Thread Eric Sunshine
On Sun, Aug 16, 2015 at 7:31 PM, Eric Sunshine wrote: > On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak wrote: >> +struct ref_formatting_state { >> + struct strbuf output; >> + struct ref_formatting_state *prev; > > Upon initial read-through of this patch, I found the name 'prev' > con

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

2015-08-16 Thread Eric Sunshine
On Mon, Aug 17, 2015 at 12:42 AM, Eric Sunshine wrote: > On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak wrote: >> - if (type & (FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN)) >> - ret = for_each_rawref(ref_filter_handler, &ref_cbdata); >> - else if (type & FILTER_REFS_AL

Re: [PATCH v11 13/13] tag.c: implement '--merged' and '--no-merged' options

2015-08-16 Thread Eric Sunshine
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak wrote: > Using 'ref-filter' APIs implement the '--merged' and '--no-merged' s/implement/to implement/ > options into 'tag.c'. The '--merged' option lets the user to only > list tags merged into the named commit. The '--no-merged' option > lets the u

Re: [PATCH v11 08/13] ref-filter: add support to sort by version

2015-08-16 Thread Eric Sunshine
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak wrote: > Add support to sort by version using the "v:refname" and > "version:refname" option. This is achieved by using the 'versioncmp()' > function as the comparing function for qsort. > > This option is included to support sorting by versions in `g

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

2015-08-16 Thread Eric Sunshine
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak wrote: > Add a function called 'for_each_reftype_fullpath()' to refs.{c,h} > which iterates through each ref for the given path without trimming > the path and also accounting for broken refs, if mentioned. > > Add 'filter_ref_kind()' in ref-filter.c

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

2015-08-16 Thread Eric Sunshine
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak wrote: > Implement an `align` atom which left-, middle-, or right-aligns the > content between %(align:..) and %(end). > > It is followed by `:,`, where the `` is > either left, right or middle and `` is the size of the area > into which the content w

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

2015-08-16 Thread Eric Sunshine
On Sun, Aug 16, 2015 at 8:04 AM, Andreas Schwab wrote: > Karthik Nayak writes: >> I think we need to squash this in >> >> diff --git a/Documentation/git-for-each-ref.txt >> b/Documentation/git-for-each-ref.txt >> index 3099631..17bd15e 100644 >> --- a/Documentation/git-for-each-ref.txt >> +++ b/D

Re: [PATCH v11 04/13] utf8: add function to align a string into given strbuf

2015-08-16 Thread Eric Sunshine
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak wrote: > Add strbuf_utf8_align() which will align a given string into a strbuf > as per given align_type and width. If the width is greater than the > string length then no alignment is performed. A couple minor comments below... > Signed-off-by: Ka

Re: "git am --abort" screwing up index?

2015-08-16 Thread Linus Torvalds
On Sun, Aug 16, 2015 at 12:46 PM, Linus Torvalds wrote: > > Maybe it has always done this, and I just haven't noticed (I usually > _just_ do the "git reset --hard" thing, don't ask me why I wanted to > be doubly sure this time). But maybe it's an effect of the new > built-in "am". I bisected this

Re: [PATCH v11 03/13] ref-filter: introduce ref_formatting_state

2015-08-16 Thread Eric Sunshine
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak wrote: > Introduce ref_formatting_state which will hold the formatted > output strbuf and is used for nesting of modifier atoms. > > Signed-off-by: Karthik Nayak > --- > diff --git a/ref-filter.c b/ref-filter.c > index edfb1c7..3259363 100644 > --- a

"git am --abort" screwing up index?

2015-08-16 Thread Linus Torvalds
So I just noticed while applying a patch with "git am" when I had a dirty tree, and I ended up getting a failure and starting over: [torvalds@i7 linux]$ git am --abort [torvalds@i7 linux]$ git reset --hard Checking out files: 100% (50794/50794), done.0794) HEAD is now at 1efdb5f0a924 M

Re: [PATCH v3] po/README: Update directions for l10n contributors

2015-08-16 Thread Philip Oakley
From: "Jiang Xin" From: Philip Oakley Some Linux distributions (such as Ubuntu) have their own l10n workflows, and their translations may be different. Add notes for this case for l10n translators. Signed-off-by: Philip Oakley Signed-off-by: Jiang Xin --- po/README | 19 +

Re: [PATCH v2 0/1] handling mistranslation reports

2015-08-16 Thread Philip Oakley
From: "Jiang Xin" 2015-08-04 6:29 GMT+08:00 Philip Oakley : Hi Jiang, This is my updated patch based on your feedback at $gmane/275141 and $gmane/275142. I've used most of your wording, though have retained a comment on considering if the translation could be held here. My original commentar

Re: [PATCH v3 2/4] path: optimize common dir checking

2015-08-16 Thread Duy Nguyen
On Sun, Aug 16, 2015 at 12:04 PM, David Turner wrote: > Duy Nguyen writes: >> On Thu, Aug 13, 2015 at 4:57 AM, David Turner > wrote: >> > Instead of a linear search over common_list to check whether >> > a path is common, use a trie. The trie search operates on >> > path prefixes, and handles e

Re: [PATCH v3] untracked-cache: fix subdirectory handling

2015-08-16 Thread Duy Nguyen
On Sun, Aug 16, 2015 at 12:17 PM, David Turner wrote: > Previously, some calls lookup_untracked would pass a full path. But > lookup_untracked assumes that the portion of the path up to and > including to the untracked_cache_dir has been removed. So > lookup_untracked would be looking in the unt

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

2015-08-16 Thread Andreas Schwab
Karthik Nayak writes: > I think we need to squash this in > > diff --git a/Documentation/git-for-each-ref.txt > b/Documentation/git-for-each-ref.txt > index 3099631..17bd15e 100644 > --- a/Documentation/git-for-each-ref.txt > +++ b/Documentation/git-for-each-ref.txt > @@ -129,7 +129,7 @@ color::

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

2015-08-16 Thread Karthik Nayak
I think we need to squash this in diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 3099631..17bd15e 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -129,7 +129,7 @@ color:: align:: left-, middle-, or ri

Re: [PATCH v11 00/13] port tag.c to use ref-filter APIs

2015-08-16 Thread Karthik Nayak
On Sun, Aug 16, 2015 at 1:08 PM, Jacob Keller wrote: > On Sat, Aug 15, 2015 at 11:00 AM, Karthik Nayak wrote: > >> >> align:: >> - Implement an `align` atom which left-, middle-, or >> - right-aligns the content between %(align:..) and >> - %(end). Followed by `:,`, where the

[PATCH v3] po/README: Update directions for l10n contributors

2015-08-16 Thread Jiang Xin
From: Philip Oakley Some Linux distributions (such as Ubuntu) have their own l10n workflows, and their translations may be different. Add notes for this case for l10n translators. Signed-off-by: Philip Oakley Signed-off-by: Jiang Xin --- po/README | 19 +++ 1 file changed, 19

Re: [PATCH v11 00/13] port tag.c to use ref-filter APIs

2015-08-16 Thread Jacob Keller
On Sat, Aug 15, 2015 at 11:00 AM, Karthik Nayak wrote: > > align:: > - Implement an `align` atom which left-, middle-, or > - right-aligns the content between %(align:..) and > - %(end). Followed by `:,`, where the > + left-, middle-, or right-align the content between %

Re: feature request: better support for typos

2015-08-16 Thread Lawrence Siebert
I believe They mean that if you type "clone --branch mister", it should ask if you meant to "clone --branch master" instead, or something. Basically if you type a non existent branch name, calculate edit distance for each branch name, probably either using a timeout or edit distance to stop if som