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

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 karthik@gmail.com wrote: align:: - Implement an `align` atom which left-, middle-, or - right-aligns the content between %(align:..) and - %(end). Followed by `:position,width`, where the + left-, middle-, or

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

2015-08-16 Thread Jiang Xin
From: Philip Oakley philipoak...@iee.org 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 philipoak...@iee.org Signed-off-by: Jiang Xin

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 jacob.kel...@gmail.com wrote: On Sat, Aug 15, 2015 at 11:00 AM, Karthik Nayak karthik@gmail.com wrote: align:: - Implement an `align` atom which left-, middle-, or - right-aligns the content between %(align:..) and -

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 dtur...@twopensource.com wrote: Duy Nguyen pclo...@gmail.com writes: On Thu, Aug 13, 2015 at 4:57 AM, David Turner dtur...@twopensource.com wrote: Instead of a linear search over common_list to check whether a path is common, use a trie. The

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 dtur...@twopensource.com 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

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

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

2015-08-16 Thread Andreas Schwab
Karthik Nayak karthik@gmail.com 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

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 karthik@gmail.com 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...

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 sch...@linux-m68k.org wrote: Karthik Nayak karthik@gmail.com 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 ---

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 karthik@gmail.com wrote: Implement an `align` atom which left-, middle-, or right-aligns the content between %(align:..) and %(end). It is followed by `:width,position`, where the `position` is either left, right or middle and `width` is the

Re: git am --abort screwing up index?

2015-08-16 Thread Linus Torvalds
On Sun, Aug 16, 2015 at 12:46 PM, Linus Torvalds torva...@linux-foundation.org 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

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 karthik@gmail.com 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()'

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 karthik@gmail.com 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

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 karthik@gmail.com 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'

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 sunsh...@sunshineco.com wrote: On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak karthik@gmail.com wrote: +struct ref_formatting_state { + struct strbuf output; + struct ref_formatting_state *prev; Upon initial read-through of this

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 sunsh...@sunshineco.com wrote: On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak karthik@gmail.com wrote: - if (type (FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN)) - ret = for_each_rawref(ref_filter_handler, ref_cbdata); -

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

2015-08-16 Thread Philip Oakley
From: Jiang Xin worldhello@gmail.com From: Philip Oakley philipoak...@iee.org 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 philipoak...@iee.org

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

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

2015-08-16 Thread Philip Oakley
From: Jiang Xin worldhello@gmail.com 2015-08-04 6:29 GMT+08:00 Philip Oakley philipoak...@iee.org: 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