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

2015-08-15 Thread 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 commentary is be

[PATCH v3] untracked-cache: fix subdirectory handling

2015-08-15 Thread David Turner
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 untracked_cache for 'foo' for 'foo/bar' (instead of just looking f

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

2015-08-15 Thread David Turner
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 excludes. > > Just be careful that the given key from git_path

Bug pushing branch to new remote via SSH

2015-08-15 Thread David Dynerman
Hello, I am encountering a bizarre error message trying to push a branch to a new remote over SSH. The error message is fatal: packfile name 'remotehost.com' does not end with '.pack' Here, remotehost.com is the internet domain name of the remote host I'm trying to push to. Obviously pushing to

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

2015-08-15 Thread Michael Haggerty
On 08/14/2015 10:04 PM, David Turner wrote: > On Fri, 2015-08-14 at 10:04 -0700, Junio C Hamano wrote: >> [...] >> So I think we should have *three* functions: >> >> - git_workspace_name(void) returns some name that uniquely >>identifies the current workspace among the workspaces linked to >>

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

2015-08-15 Thread Michael Haggerty
On 08/14/2015 07:04 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >> Let's take a step back. >> >> We have always had a ton of code that uses `git_path()` and friends to >> convert abstract things into filesystem paths. Let's take the >> reference-handling code as an example: >> ... >> T

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

2015-08-15 Thread Karthik Nayak
From: Karthik Nayak Make 'tag.c' use 'ref-filter' APIs for iterating through refs, sorting and printing of refs. This removes most of the code used in 'tag.c' replacing it with calls to the 'ref-filter' library. Make 'tag.c' use the 'filter_refs()' function provided by 'ref-filter' to filter out

[PATCH v11 10/13] tag.c: use 'ref-filter' data structures

2015-08-15 Thread Karthik Nayak
From: Karthik Nayak Make 'tag.c' use 'ref-filter' data structures and make changes to support the new data structures. This is a part of the process of porting 'tag.c' to use 'ref-filter' APIs. This is a temporary step before porting 'tag.c' to use 'ref-filter' completely. As this is a temporary

[PATCH v11 07/13] ref-filter: support printing N lines from tag annotation

2015-08-15 Thread Karthik Nayak
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. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-of

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

2015-08-15 Thread Karthik Nayak
From: Karthik Nayak 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 to check the kind of ref being handled and

[PATCH v11 09/13] ref-filter: add option to match literal pattern

2015-08-15 Thread Karthik Nayak
From: Karthik Nayak 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 like `git tag -l foo*` which would match

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

2015-08-15 Thread Karthik Nayak
From: Karthik Nayak 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 `git tag -l` which will eventaully be ported

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

2015-08-15 Thread Karthik Nayak
From: Karthik Nayak Using 'ref-filter' APIs implement the '--merged' and '--no-merged' 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 user to only list tags not merged into the named commit. If no object

[PATCH v11 12/13] tag.c: implement '--format' option

2015-08-15 Thread Karthik Nayak
From: Karthik Nayak Implement the '--format' option provided by 'ref-filter'. This lets the user list tags as per desired format similar to the implementation in 'git for-each-ref'. Add tests and documentation for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by

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

2015-08-15 Thread Karthik Nayak
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 will be placed. If the content between %(align:) and %(end) is more

[PATCH v11 02/13] ref-filter: print output to strbuf for formatting

2015-08-15 Thread Karthik Nayak
Introduce a strbuf `output` which will act as a substitute rather than printing directly to stdout. This will be used for formatting eventually. Rename some functions to reflect the changes made: print_value() -> append_atom() emit()-> append_literal() Mentored-by: Christian Couder Mento

[PATCH v11 01/13] ref-filter: move `struct atom_value` to ref-filter.c

2015-08-15 Thread Karthik Nayak
Since atom_value is only required for the internal working of ref-filter it doesn't belong in the public header. Helped-by: Eric Sunshine Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- ref-filter.c | 5 + ref-filter.h | 5 + 2 files changed, 6

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

2015-08-15 Thread Karthik Nayak
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. Helped-by: Eric Sunshine Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak

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

2015-08-15 Thread Karthik Nayak
Introduce ref_formatting_state which will hold the formatted output strbuf and is used for nesting of modifier atoms. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- ref-filter.c | 65 1 file

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

2015-08-15 Thread Karthik Nayak
Karthik Nayak (13): ref-filter: move `struct atom_value` to ref-filter.c ref-filter: print output to strbuf for formatting ref-filter: introduce ref_formatting_state utf8: add function to align a string into given strbuf ref-filter: implement an `align` atom ref-filter: add option to fi

[no subject]

2015-08-15 Thread Mr. Peter Wong
Tervehdys ja kohteliaisuuksia. Olen Peter Wong Työskentelen BANK OF CHINA Minulla Business ehdotus vireessä US $ 22.500.000 Million siirretään offshore tilin apua, jos haluaa. Jos kiinnostaa minä lähetän teille täyden tapahtuman tiedot saatuaan vastaustasi. Voit ottaa yhteyttä minuun minun yks

Re: [PATCH v7 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-15 Thread Johan Herland
On Sat, Aug 15, 2015 at 12:53 AM, Jacob Keller wrote: > On Fri, Aug 14, 2015 at 3:11 PM, Junio C Hamano wrote: >> Jacob Keller writes: >> >>> diff --git a/Documentation/config.txt b/Documentation/config.txt >>> index 75ec02e8e90a..de67ad1fdedf 100644 >>> --- a/Documentation/config.txt >>> +++ b/

Re: [PATCH v7 4/4] notes: teach git-notes about notes..mergestrategy option

2015-08-15 Thread Johan Herland
On Fri, Aug 14, 2015 at 11:13 PM, Jacob Keller wrote: > From: Jacob Keller > > Add new option "notes..mergestrategy" option which specifies the merge > strategy for merging into a given notes ref. This option enables > selection of merge strategy for particular notes refs, rather than all > notes

Re:

2015-08-15 Thread Duy Nguyen
On Wed, Aug 5, 2015 at 7:47 PM, Ivan Chernyavsky wrote: > Dear community, > > For some time I'm wondering why there's no "--grep" option to the "git > branch" command, which would request to print only branches having specified > string/regexp in their history. Probably because nobody is intere

Re: feature request: better support for typos

2015-08-15 Thread Duy Nguyen
On Sat, Aug 8, 2015 at 1:12 AM, Ralf Thielow wrote: > Hi, > > when a user made a typo, Git is not good in guessing what > the user could have meant, except for git commands. I think > this is an area with room for improvements. > Let's look into branches. When I "clone --branch" and make > a typo,

Re: [PATCH v7 3/4] notes: add notes.mergestrategy option to select default strategy

2015-08-15 Thread Johan Herland
On Fri, Aug 14, 2015 at 11:13 PM, Jacob Keller wrote: > From: Jacob Keller > > Teach git-notes about "notes.mergestrategy" to select a general strategy > for all notes merges. This enables a user to always get expected merge > strategy such as "cat_sort_uniq" without having to pass the "-s" optio

Re: [PATCH 0/17] removing questionable uses of git_path

2015-08-15 Thread Duy Nguyen
On Mon, Aug 10, 2015 at 4:27 PM, Jeff King wrote: > The problem is that git_path uses a static buffer that gets overwritten > by subsequent calls. resolve_ref() was in the same boat, then we renamed it to resolve_ref_unsafe(), I believe with an intention to eventually kill it. But it lives on any

Re: bug: git-archive does not use the zip64 extension for archives with more than 16k entries

2015-08-15 Thread Duy Nguyen
On Thu, Aug 13, 2015 at 2:40 AM, René Scharfe wrote: > Seriously, though: What kind of repository has that many files and uses the > ZIP format to distribute snapshots? Just curious. Not the "uses the zip format" part, but at least webkit and gentoo-x86 both exceed 64k limit. Even if we don't su

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

2015-08-15 Thread Duy Nguyen
On Sun, Aug 9, 2015 at 9:11 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. I smell an opportunity to reuse this code and kill som

Re: [PATCHv5] http: add support for specifying the SSL version

2015-08-15 Thread Elia Pinto
2015-08-14 23:32 GMT+02:00 Junio C Hamano : > Elia Pinto writes: > >> Teach git about a new option, "http.sslVersion", which permits one to >> specify the SSL version to use when negotiating SSL connections. The >> setting can be overridden by the GIT_SSL_VERSION environment >> variable. >> >> S

Re: [PATCH v3 3/4] refs: make refs/worktree/* per-worktree

2015-08-15 Thread Duy Nguyen
On Thu, Aug 13, 2015 at 4:57 AM, David Turner wrote: > We need a place to stick refs for bisects in progress that is not > shared between worktrees. So we use the refs/worktree/ hierarchy. > > The is_per_worktree_ref function and associated docs learn that > refs/worktree/ is per-worktree, as doe

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

2015-08-15 Thread Duy Nguyen
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 excludes. Just be careful that the given key from git_path is not normalized. I think you a

Re: [PATCH v3 1/4] refs: clean up common_list

2015-08-15 Thread Duy Nguyen
On Thu, Aug 13, 2015 at 4:57 AM, David Turner wrote: > +struct common_dir common_list[] = { > + { "branches", 0, 1, 0 }, > + { "hooks", 0, 1, 0 }, > + { "info", 0, 1, 0 }, > + { "info/sparse-checkout", 0, 0, 1 }, > + { "logs", 1, 1, 0 }, > + { "logs/HEAD", 1, 1,

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

2015-08-15 Thread Duy Nguyen
First of all, sorry for my long silence. I'm going through my git inbox now. > diff --git a/dir.c b/dir.c > index e7b89fe..314080b 100644 > --- a/dir.c > +++ b/dir.c > @@ -631,6 +631,7 @@ static struct untracked_cache_dir > *lookup_untracked(struct untracked_cache *uc, > memset(d, 0, sizeof