Re: [PATCH v2 22/22] git-remote-mediawiki: Clearly rewrite double dereference

2013-06-07 Thread Eric Sunshine
On Fri, Jun 7, 2013 at 5:42 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: @$var structures are re-written in the following way: @{$var} It makes them more readable. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr ---

Re: [PATCH v2 07/22] git-remote-mediawiki: Change style of some regular expressions

2013-06-07 Thread Eric Sunshine
On Fri, Jun 7, 2013 at 5:42 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: - Remove m modifier when useless (m// and // was used randomly; this makes the code more coherent) - Remove stringy split (split('c', ...) instead of split(/c/, ...)) - Use {}{} instead of /// when slashes are used

Re: [PATCH v2 14/22] git-remote-mediawiki: Check return value of open + remove import of unused open2

2013-06-07 Thread Eric Sunshine
On Fri, Jun 7, 2013 at 5:42 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl |4 ++-- 1 file changed, 2 insertions(+), 2

Re: [PATCH v2 15/22] git-remote-mediawiki: Put long code into a subroutine

2013-06-07 Thread Eric Sunshine
On Fri, Jun 7, 2013 at 5:42 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 42 +-- 1 file

Re: [PATCH v2 16/22] git-remote-mediawiki: Modify strings for a better coding-style

2013-06-07 Thread Eric Sunshine
On Fri, Jun 7, 2013 at 5:42 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: - strings which don't need interpolation are single-quoted for more clarity and slight gain of performance - interpolation is preferred over concatenation in many cases, for more clarity - variables are always

Re: [PATCH v2 17/22] git-remote-mediawiki: Brace file handles for print for more clarity

2013-06-07 Thread Eric Sunshine
On Fri, Jun 7, 2013 at 5:42 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: This follows the following rule: InputOutput::RequireBracedFileHandleWithPrint (Severity: 1) The `print' and `printf' functions have a unique syntax that supports an optional file handle argument. Conway

Re: [PATCH v2 16/22] git-remote-mediawiki: Modify strings for a better coding-style

2013-06-08 Thread Eric Sunshine
On Sat, Jun 8, 2013 at 4:32 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: Le 08/06/2013 02:39, Eric Sunshine a écrit : On Fri, Jun 7, 2013 at 5:42 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: - strings which don't need interpolation are single-quoted for more clarity and slight

Re: [PATCH v2 14/22] git-remote-mediawiki: Check return value of open + remove import of unused open2

2013-06-08 Thread Eric Sunshine
On Sat, Jun 8, 2013 at 2:45 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: Le 08/06/2013 20:41, Matthieu Moy a écrit : Célestin Matte celestin.ma...@ensimag.fr writes: Le 08/06/2013 02:14, Eric Sunshine a écrit : These two changes are unrelated and could be split into distinct patches

Re: [PATCH] git-remote-mediawiki: Fix a bug in a regexp

2013-06-08 Thread Eric Sunshine
On Sat, Jun 8, 2013 at 9:35 AM, Célestin Matte celestin.ma...@ensimag.fr wrote: In Perl, '\n' is not a newline, but instead a literal backslash followed by an n. As the output of rev-list --first-parent is line-oriented, what we want here is a newline. Signed-off-by: Célestin Matte

Re: [PATCH] git-remote-mediawiki: Fix a bug in a regexp

2013-06-08 Thread Eric Sunshine
On Sat, Jun 8, 2013 at 10:57 PM, Jeff King p...@peff.net wrote: On Sat, Jun 08, 2013 at 08:38:56PM +0200, Matthieu Moy wrote: Célestin Matte celestin.ma...@ensimag.fr writes: In Perl, '\n' is not a newline, but instead a literal backslash followed by an n. As the output of rev-list

Re: [PATCH 1/2] core: use env variable instead of config var to turn on logging pack access

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 1:22 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: 5f44324 (core: log offset pack data accesses happened - 2011-07-06) provides a way to observe pack access patterns via a config switch. Setting an environment variable looks more obvious than a config var, especially

Re: [PATCH 1/2] core: use env variable instead of config var to turn on logging pack access

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 1:22 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: 5f44324 (core: log offset pack data accesses happened - 2011-07-06) provides a way to observe pack access patterns via a config switch. Setting an environment variable looks more obvious than a config var, especially

Re: [PATCH 2/2] git.txt: document GIT_TRACE_PACKET

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 1:53 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This can help with debugging object negotiation or other protocol issues. s///g Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a

Re: [PATCH] diff: add --ignore-blank-lines option

2013-06-09 Thread Eric Sunshine
On Sat, Jun 8, 2013 at 4:44 PM, Antoine Pelisse apeli...@gmail.com wrote: The goal of the patch is to introduce the GNU diff -B/--ignore-blank-lines as closely as possible. The short option is not available because it's already used for break-rewrites. When this option is used, git-diff will

Re: [PATCH 04/45] pathspec: add copy_pathspec

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The function is made to use with free_pathspec() because a simple struct assignment is not enough (free_pathspec wants to free items pointer). I had to read this about five or six times before I could parse and

Re: [PATCH] Document .git/modules

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 6:37 AM, Fredrik Gustafsson iv...@iveqy.com wrote: A note in the begging of this document describe the behavior already. s/begging/beginning/ s/describe/describes/ This patch just add where to find the repositories. s/add/adds/ Signed-off-by: Fredrik Gustafsson

Re: [PATCH v3 22/28] git-remote-mediawiki: Modify strings for a better coding-style

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 6:22 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: - strings which don't need interpolation are single-quoted for more clarity and slight gain of performance - interpolation is preferred over concatenation in many cases, for more clarity - variables are always

Re: [PATCH v3 00/28] Follow perlcritic's recommandations

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 6:22 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: Changes with v2: - Remove patch [02/22] about using the Readonly module - Split commit [07/22] into 5 different ones This was easier to review after being split. Thanks. - Split commit [14/22] into 2 different

Re: [PATCH 05/45] Add parse_pathspec() that converts cmdline args to struct pathspec

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/pathspec.c b/pathspec.c index 8fe56cd..b49bd51 100644 --- a/pathspec.c +++ b/pathspec.c @@ -195,15 +195,128 @@ static const char *prefix_pathspec(const char *prefix, int prefixlen, const char +/* +

Re: [PATCH 07/45] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/pathspec.c b/pathspec.c index 89bdc7f..9e68321 100644 --- a/pathspec.c +++ b/pathspec.c @@ -271,10 +271,20 @@ void parse_pathspec(struct pathspec *pathspec, if (!entry !prefix)

Re: [PATCH 09/45] parse_pathspec: a special flag for max_depth feature

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: parse_pathspec: a special flag for max_depth feature s/a/add/ match_pathspec_depth() and tree_entry_interesting() check max_depth field in order to support git grep --max-depth. The feature activation is tied to

Re: [PATCH 10/45] parse_pathspec: support stripping submodule trailing slashes

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This flag is equivalent to builtin/ls-files.c:strip_trailing_slashes() and is intended to replace that function when ls-files is converted to use parse_pathspec. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com

Re: [PATCH 12/45] parse_pathspec: support prefixing original patterns

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This makes 'original' suitable for passing to an external command because all pathspec magic is left in place, provided that the external command understands pathspec. The prefixing is needed because we usually

Re: [PATCH 13/45] Guard against new pathspec magic in pathspec matching code

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: GUARD_PATHSPEC() marks pathspec-sensitive code, basically all those that touch anything in 'struct pathspec' except fields nr and original. GUARD_PATHSPEC() is not supposed to fail. It's mainly to help the designers

Re: [PATCH] completion: remove ancient ensure colon in COMP_WORDBREAKS workaround

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 7:59 PM, SZEDER Gábor sze...@ira.uka.de wrote: Fedore 9 shipped the gvfs package with a buggy Bash completion script: s/Fedore/Fedora/ it removed the ':' character from COMP_WORDBREAKS, thereby breaking certain features of git's completion script. We worked this around

Re: [PATCH v2 1/4] toposort: rename lifo field

2013-06-09 Thread Eric Sunshine
On Sun, Jun 9, 2013 at 7:24 PM, Junio C Hamano gits...@pobox.com wrote: The primary invariant of sort_in_topological_order() is that a parent commit is not emitted untile all children of it are. When s/untile/until/ traversing a forked history like this with git log C E: ABC

Re: [PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Eric Sunshine
On Wed, Jun 12, 2013 at 4:47 PM, Célestin Matte celestin.ma...@ensimag.fr wrote: Le 12/06/2013 22:34, Célestin Matte a écrit : Célestin Matte celestin.ma...@ensimag.fr writes: Actually, there still is a problem: the defined(@array) (introduced with the change in [21/31]) produces a warning.

Re: [PATCH] match-trees: factor out fill_tree_desc_strict

2013-06-13 Thread Eric Sunshine
On Thu, Jun 13, 2013 at 2:19 PM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Deduplicate code by moving tree_desc initialtization into a helper s/initialtization/initialization/ function, fill_tree_desc_strict. It is like fill_tree_descriptor, except that it only accepts tree hashes and

Re: [PATCH] http.c: don't rewrite the user:passwd string multiple times

2013-06-17 Thread Eric Sunshine
On Mon, Jun 17, 2013 at 10:00 PM, Brandon Casey bca...@nvidia.com wrote: From: Brandon Casey draf...@gmail.com Curl requires that we manage any strings that we pass to it as pointers. So, we should not be overwriting this strbuf after we've passed it to curl. Additionally, it is unnecessary

Re: [PATCH v2 06/13] bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()

2013-06-17 Thread Eric Sunshine
On Mon, Jun 17, 2013 at 10:16 PM, SZEDER Gábor sze...@ira.uka.de wrote: From: SZEDER Gábor sze...@ira.uka.de __git_ps1() finds out the path to the repository by using the __gitdir() helper function. __gitdir() is basically just a wrapper around 'git rev-parse --git-dir', extended with

Re: [PATCH 13/16] t/t5505-remote: test multiple push/pull in remotes-file

2013-06-21 Thread Eric Sunshine
On Fri, Jun 21, 2013 at 7:12 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Extend the test migrate a remote from named file in $GIT_DIR/remotes to test that multiple Push: and Pull: lines in the remotes-file works as expected. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com ---

Re: [PATCH] git-daemon: have --no-syslog

2013-06-23 Thread Eric Sunshine
On Sat, Jun 22, 2013 at 1:41 PM, Andreas Krey a.k...@gmx.de wrote: diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 223f731..007d3fc 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -113,6 +113,10 @@ OPTIONS Log to syslog

Re: [PATCH 4/6] t/t5528-push-default: generalize test_push_*

2013-06-24 Thread Eric Sunshine
On Mon, Jun 24, 2013 at 4:33 AM, Johan Herland jo...@herland.net wrote: On Mon, Jun 24, 2013 at 9:28 AM, Junio C Hamano gits...@pobox.com wrote: Johan Herland jo...@herland.net writes: + git --git-dir=${3:-repo1} log -1 --format='%h %s' $2 actual Isn't ${3:-repo1} a bashism? I do

[PATCH/RFC 1/4] contrib: add git-contacts helper

2013-06-30 Thread Eric Sunshine
. This is a Perl rewrite of Felipe Contreras' git-related patch series[1] written in Ruby. [1]: http://thread.gmane.org/gmane.comp.version-control.git/226065/ Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- To better support Windows, a follow-up patch may want to add functionality similar

[PATCH/RFC 2/4] contrib: contacts: add support for multiple patches

2013-06-30 Thread Eric Sunshine
Accept multiple patch files rather than only one. For example: % git contacts feature/*.patch Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- contrib/contacts/git-contacts | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/contacts/git-contacts b

[PATCH/RFC 3/4] contrib: contacts: add ability to parse from committish

2013-06-30 Thread Eric Sunshine
Committishes can be mentioned along with patch files in the same invocation. For example: % git contacts master..feature extra/*.patch Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- contrib/contacts/git-contacts | 28 ++-- 1 file changed, 26 insertions(+), 2

Re: [PATCH 3/3] fetch-pack: avoid quadratic behavior in rev_list_push

2013-07-02 Thread Eric Sunshine
On Tue, Jul 2, 2013 at 2:24 AM, Jeff King p...@peff.net wrote: When we call find_common to start finding common ancestors with the remote side of a fetch, the first thing we do is insert the tip of each ref into our rev_list linked list. We keep the list sorted the whole time with

Re: [PATCH/RFC 1/4] contrib: add git-contacts helper

2013-07-02 Thread Eric Sunshine
On Mon, Jul 1, 2013 at 2:39 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts new file mode 100755 index 000..9007bae --- /dev/null +++ b/contrib/contacts/git-contacts

Re: [PATCH/RFC 2/4] contrib: contacts: add support for multiple patches

2013-07-02 Thread Eric Sunshine
On Mon, Jul 1, 2013 at 2:50 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: Accept multiple patch files rather than only one. For example: % git contacts feature/*.patch Signed-off-by: Eric Sunshine sunsh...@sunshineco.com @@ -93,6 +96,7 @@ sub

Re: [PATCH/RFC 0/4] Perl rewrite of Ruby git-related

2013-07-02 Thread Eric Sunshine
On Mon, Jul 1, 2013 at 1:00 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: No attempt is made to answer Junio's v9 review[5], as I lack sufficient insight with '-C' options to be able to respond properly. I just wanted to see if we want to allow

Re: [PATCH/RFC 1/4] contrib: add git-contacts helper

2013-07-02 Thread Eric Sunshine
On Tue, Jul 2, 2013 at 2:32 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: The author name and email can be grabbed from the blame output without doing this (and the result may be more robust), but you would need to read from the log message anyway

Re: [PATCH 2/2] teach format-patch to place other authors into in-body From

2013-07-03 Thread Eric Sunshine
On Wed, Jul 3, 2013 at 3:08 AM, Jeff King p...@peff.net wrote: Format-patch generates emails with the From address set to the author of each patch. If you are going to send the emails, however, you would want to replace the author identity with yours (if they are not the same), and bump the

[PATCH v2 1/3] contrib: add git-contacts helper

2013-07-03 Thread Eric Sunshine
' git-related patch series[1] written in Ruby. [1]: http://thread.gmane.org/gmane.comp.version-control.git/226065/ Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- contrib/contacts/git-contacts | 127 ++ 1 file changed, 127 insertions(+) create mode

[PATCH v2 3/3] contrib: contacts: interpret committish akin to format-patch

2013-07-03 Thread Eric Sunshine
As a convenience, accept the same style since committish as accepted by git-format-patch. For example: % git contacts master will consider commits in the current branch built atop 'master', just as git format-patch master will format commits built atop 'master'. Signed-off-by: Eric Sunshine

[PATCH v2 0/3] Perl rewrite of Ruby git-related

2013-07-03 Thread Eric Sunshine
; or enhance git-blame to accept multiple -L's. * Improve Windows support if needed, possibly via grabbing run_cmd_pipe() from git-add--interactive.perl or similar. Eric Sunshine (3): contrib: add git-contacts helper contrib: contacts: add ability to parse from committish contrib: contacts

[PATCH v2 2/3] contrib: contacts: add ability to parse from committish

2013-07-03 Thread Eric Sunshine
For example: % git contacts master..feature Committishes and patch files can be mentioned in the same invocation: % git contacts master..feature extra/*.patch Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- contrib/contacts/git-contacts | 38

Re: unexpected file deletion after using git rebase --abort

2013-07-04 Thread Eric Sunshine
On Thu, Jul 4, 2013 at 3:35 PM, Paul A. Kennedy paken...@pobox.com wrote: diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index aca8405..ffaef29 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -238,6 +238,13 @@ leave out at most one of

Re: [PATCH v2 2/2] send-email: introduce sendemail.smtpsslcertpath

2013-07-05 Thread Eric Sunshine
On Fri, Jul 5, 2013 at 8:05 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Use the ca-certificates in /etc/ssl/certs by default (that's where most distributions put it). SSL_VERIFY_NONE is now the fallback mode. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- diff --git

[PATCH/RFC] blame: accept multiple -L ranges

2013-07-07 Thread Eric Sunshine
to accept multiple -L ranges. Overlapping and out-of-order ranges are accepted and handled gracefully. For example: git blame -L 3,+4 -L 91,+7 -L 2,3 -L 89,100 source.c emits blame information for lines 2-6 and 89-100. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- This is RFC because

[PATCH] range_set: fix coalescing bug when range is a subset of another

2013-07-07 Thread Eric Sunshine
added via range_set_append_unsafe(), sort_and_merge_range_set() incorrectly coalesces them to range 1-3 rather than the correct union range 1-5. Fix this bug. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Presumably, this problem does not happen in practice, so it's not clear if the patch

Re: [PATCH 15/22] read-cache: read index-v5

2013-07-07 Thread Eric Sunshine
On Sun, Jul 7, 2013 at 4:11 AM, Thomas Gummerer t.gumme...@gmail.com wrote: Make git read the index file version 5 without complaining. This version of the reader doesn't read neither the cache-tree nor the resolve undo data, but doesn't choke on an index that includes such data. --- diff

Re: [PATCH 17/22] read-cache: read cache-tree in index-v5

2013-07-07 Thread Eric Sunshine
On Sun, Jul 7, 2013 at 4:11 AM, Thomas Gummerer t.gumme...@gmail.com wrote: Since the cache-tree data is saved as part of the directory data, we already read it at the beginning of the index. The cache-tree is only converted from this directory data. The cache-tree data is arranged in a tree,

Re: [PATCH 18/22] read-cache: write index-v5

2013-07-07 Thread Eric Sunshine
On Sun, Jul 7, 2013 at 4:11 AM, Thomas Gummerer t.gumme...@gmail.com wrote: Write the index version 5 file format to disk. This version doesn't write the cache-tree data and resolve-undo data to the file. The main work is done when filtering out the directories from the current in-memory

[PATCH v2 1/2] t4211: fix broken test when one -L range is subset of another

2013-07-08 Thread Eric Sunshine
in the presence of the sort_and_merge_range_set() coalescing bug. Do so by changing the expected output to the commits mentioned in the 4-$ output above. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t4211-line-log.sh | 4 +- t/t4211/expect.multiple-superset | 134

[PATCH v2 2/2] range_set: fix coalescing bug when range is a subset of another

2013-07-08 Thread Eric Sunshine
added via range_set_append_unsafe(), sort_and_merge_range_set() incorrectly coalesces them to range 1-3 rather than the correct union range 1-5. Fix this bug. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- line-log.c | 3 ++- t/t4211-line-log.sh | 4 ++-- 2 files changed, 4

[PATCH v2 0/2] fix broken range_set tests and coalescing

2013-07-09 Thread Eric Sunshine
to incorrect expected state. Mark the tests as expect-failure. patch 2/2: Fix the sort_and_merge_range_set() coalesce bug. Same as v1 but also flips the tests to expect-success. [1]: http://article.gmane.org/gmane.comp.version-control.git/229774 Eric Sunshine (2): t4211: fix broken test when one

Re: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-09 Thread Eric Sunshine
[Added Cc:Thomas Rast] On Sun, Jul 7, 2013 at 5:58 AM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: git-blame accepts only zero or one -L option. Clients requiring blame information for multiple disjoint ranges are therefore forced either to invoke

Re: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-09 Thread Eric Sunshine
On Tue, Jul 9, 2013 at 12:39 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: As implemented by this patch, the behavior of git-blame with multiple -L's is consistent with that of git-log with multiple -L's. The implemented behavior feels intuitive

Re: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-09 Thread Eric Sunshine
On Tue, Jul 9, 2013 at 1:42 PM, Thomas Rast tr...@inf.ethz.ch wrote: Junio C Hamano gits...@pobox.com writes: (2) In the ranges -L anything,/B/ -L /C/,anything, the beginning of the second range is found by choosing C that comes _after_ the end of the previous range (/B/ may choose

Re: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-09 Thread Eric Sunshine
On Tue, Jul 9, 2013 at 2:55 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Tue, Jul 9, 2013 at 1:42 PM, Thomas Rast tr...@inf.ethz.ch wrote: Junio C Hamano gits...@pobox.com writes: (2) In the ranges -L anything,/B/ -L /C/,anything

Re: [PATCH v4 1/3] push: further clean up fields of struct ref

2013-01-24 Thread Eric Sunshine
On Wed, Jan 23, 2013 at 4:55 PM, Junio C Hamano gits...@pobox.com wrote: The nonfastforward and update fields are only used while deciding what value to assign to the status locally in a single function. Remove them from the struct ref. The requires_force field is not used to decide if the

Re: [PATCH 1/2] docs: clarify git-branch --list behavior

2013-01-31 Thread Eric Sunshine
On Thu, Jan 31, 2013 at 1:45 AM, Jeff King p...@peff.net wrote: +If `--list` is given, or if there are no non-option arguments, existing +branches are listed; the current branch will be highlighted with an +asterisk. Option `-r` causes the remote-tracking branches to be listed, +and option

Re: [PATCH v3 15/19] pkt-line: share buffer/descriptor reading implementation

2013-02-22 Thread Eric Sunshine
On Wed, Feb 20, 2013 at 3:04 PM, Jeff King p...@peff.net wrote: diff --git a/pkt-line.h b/pkt-line.h index fa93e32..47361f5 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -25,9 +25,16 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f void

Re: [PATCH v2 2/3] environment: add GIT_PREFIX to local_repo_env

2013-03-08 Thread Eric Sunshine
On Fri, Mar 8, 2013 at 4:30 AM, Jeff King p...@peff.net wrote: The GIT_PREFIX variable is set based on our location within the working tree. It should therefore be cleared whenever GIT_WORK_TREE is cleared. In practice, this doesn't cause any bugs, because none of the sub-programs we invoke

Re: [PATCH v3 09/13] exclude: filter out patterns not applicable to the current directory

2013-03-12 Thread Eric Sunshine
On Tue, Mar 12, 2013 at 9:04 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The algorithm implemented here is a naive one. Patterns can be either active or passive: - When we enter a new directory (e.g. from root to foo), currently active patterns may no longer be applicable and can be

Re: [PATCH v1 10/45] parse_pathspec: a special flag for max_depth feature

2013-03-15 Thread Eric Sunshine
On Fri, Mar 15, 2013 at 2:06 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: match_pathspec_depth() and tree_entry_interesting() check max_depth field in order to support git grep --max-depth. The feature activation is tied to recursive field, which led to some unwated s/unwated/unwanted/

Re: [PATCH v1 40/45] parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN

2013-03-15 Thread Eric Sunshine
On Fri, Mar 15, 2013 at 2:06 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Prefix length is not preserved across commands when --literal-pathspecs is specified (no magic is allowed, including 'prefix'). That's OK because we all paths are literal. No magic, no special treatment s/we all/we

Re: [PATCH v1 44/45] pathspec: support :(glob) syntax

2013-03-15 Thread Eric Sunshine
On Fri, Mar 15, 2013 at 2:06 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: +GIT_GLOB_PATHSPECS:: + Setting this variable to `1` will cause git to treat all + pathspecs as glob patterns (aka glob magic). Per recent git - Git normalization, probably: s/git/Git/ +

Re: [PATCH] rev-parse: Clarify documentation of @{upstream} syntax

2013-03-16 Thread Eric Sunshine
On Sat, Mar 16, 2013 at 2:51 PM, Kacper Kornet drae...@pld-linux.org wrote: git-rev-parse interprets string in string@{upstream} as a name of a branch not a ref. For example refs/heads/master@{upstream} looks for an upstream branch that is merged by git-pull to ref refs/heads/refs/heads/master

Re: [PATCH 05/12] pretty: save commit encoding from logmsg_reencode if the caller needs it

2013-03-17 Thread Eric Sunshine
On Fri, Mar 15, 2013 at 10:24 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The commit encoding is parsed by logmsg_reencode, there's no need for the caller to re-parse it again. The reencoded message now have the s/have/has/ new encoding, not the original one. The caller would need to

Re: [PATCH 09/12] pretty: add %C(auto) for auto-coloring on the next placeholder

2013-03-17 Thread Eric Sunshine
On Fri, Mar 15, 2013 at 10:24 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This is not simply convenient over $C(auto,xxx). Some placeholders s/\$/%/ (actually only one, %d) do multi coloring and we can't emit a multiple colors with %C(auto,xxx). diff --git

Re: [PATCH 10/12] pretty: support padding placeholders, % % and %

2013-03-17 Thread Eric Sunshine
On Fri, Mar 15, 2013 at 10:24 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Either %, % or % standing before a placeholder specifies how many s/%/%/ diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 8734224..87ca2c4 100644 ---

Re: [PATCH 12/12] pretty: support % that steal trailing spaces

2013-03-17 Thread Eric Sunshine
On Fri, Mar 15, 2013 at 10:24 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This is pretty useful in `%(100)%s%Cred%(20)% an' where %s does not s/% an/%an/ use up all 100 columns and %an needs more than 20 columns. By replacing %(20) with %(20), %an can steal spaces from %s. diff --git

Re: [PATCH 4/8] dir.c: git-status --ignored: don't list empty directories as ignored

2013-03-18 Thread Eric Sunshine
On Mon, Mar 18, 2013 at 4:28 PM, Karsten Blees karsten.bl...@gmail.com wrote: When checking if a directory is already listed as untracked (i.e. shouldn't be listed as ignored as well), don't assume that the dirctory has only s/dirctory/directory/ ignored files if it doesn't have untracked

Re: [PATCH 6/8] dir.c: unify is_excluded and is_path_excluded APIs

2013-03-18 Thread Eric Sunshine
On Mon, Mar 18, 2013 at 4:29 PM, Karsten Blees karsten.bl...@gmail.com wrote: Directories could also be excluded by exclude patterns specified on the command line or .git/info/exclude, so we cannot simply skip prep_exclude entirely if there's no .gitignore file name

Re: [PATCH 1/4] remote.c: simply a bit of code using git_config_string()

2013-03-18 Thread Eric Sunshine
On Mon, Mar 18, 2013 at 9:16 AM, Ramkumar Ramachandra artag...@gmail.com wrote: remote.c: simply a bit of code using git_config_string() s/simply/simplify/ A small segment where handle_config() parses the branch.remote configuration variable can be simplified using git_config_string().

Re: [PATCH 3/4] remote.c: introduce remote.pushdefault

2013-03-18 Thread Eric Sunshine
On Mon, Mar 18, 2013 at 9:16 AM, Ramkumar Ramachandra artag...@gmail.com wrote: branch.name.remote:: - When in branch name, it tells 'git fetch' and 'git push' which - remote to fetch from/push to. It defaults to `origin` if no remote is - configured. `origin` is also used

Re: [PATCH 4/4] remote.c: introduce branch.name.pushremote

2013-03-18 Thread Eric Sunshine
On Mon, Mar 18, 2013 at 9:16 AM, Ramkumar Ramachandra artag...@gmail.com wrote: - If no remote is configured, or if you are not on any branch, - it defaults to `origin` for fetching and `remote.pushdefault` - for pushing. + The remote to push to, for the current branch,

Re: [PATCH v2] index-pack: always zero-initialize object_entry list

2013-03-20 Thread Eric Sunshine
On Tue, Mar 19, 2013 at 12:17 PM, Jeff King p...@peff.net wrote: To ensure that all depths start at 0, that commit changed calls to xmalloc the object_entry list into calls to xcalloc. However, it forgot that we grow the list with xrealloc later. These extra entries are used when we add an

Re: [PATCH v2] index-pack: always zero-initialize object_entry list

2013-03-20 Thread Eric Sunshine
On Wed, Mar 20, 2013 at 3:13 PM, Jeff King p...@peff.net wrote: On Wed, Mar 20, 2013 at 03:12:07PM -0400, Eric Sunshine wrote: On Tue, Mar 19, 2013 at 12:17 PM, Jeff King p...@peff.net wrote: To ensure that all depths start at 0, that commit changed calls to xmalloc the object_entry list

Re: [PATCH v2 06/45] Add parse_pathspec() that converts cmdline args to struct pathspec

2013-03-20 Thread Eric Sunshine
On Wed, Mar 20, 2013 at 8:16 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: +static void NORETURN unsupported_magic(const char *pattern, + unsigned magic, + unsigned short_magic) +{ + struct strbuf sb =

Re: [PATCH v2 14/45] Guard against new pathspec magic in pathspec matching code

2013-03-20 Thread Eric Sunshine
On Wed, Mar 20, 2013 at 8:16 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/Documentation/technical/api-setup.txt b/Documentation/technical/api-setup.txt index 59a947e..f62528e 100644 --- a/Documentation/technical/api-setup.txt +++ b/Documentation/technical/api-setup.txt @@

Re: [PATCH] t3200 (branch): modernize style

2013-03-20 Thread Eric Sunshine
On Wed, Mar 20, 2013 at 8:30 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Style is inconsistent throughout the file. Make the following changes: 1. Indent everything with tabs. 2. Put the opening quote (') for the test in the same line as test_expect_succcess, and the closing

Re: [PATCH] do not use GIT_TRACE_PACKET=3 in tests

2013-03-20 Thread Eric Sunshine
On Wed, Mar 20, 2013 at 1:43 PM, Jeff King p...@peff.net wrote: Some test scripts use the GIT_TRACE mechanism to dump debugging information to descriptor 3 (and point it to a file using the shell). On Windows, however, bash is unable to set up descriptor 3. We do not write our trace to the

Re: [PATCH v9 5/5] Speed up log -L... -M

2013-03-21 Thread Eric Sunshine
On Thu, Mar 21, 2013 at 8:52 AM, Thomas Rast tr...@student.ethz.ch wrote: This is a bit hacky and should really be replaced by equivalent support in --follow, and just using that. However, in the meantime it s/using/use/ speeds up 'log -M -L' by an order of magnitude. -- To unsubscribe from

Re: [PATCH v2 00/45] parse_pathspec and :(glob) magic

2013-03-23 Thread Eric Sunshine
On Fri, Mar 22, 2013 at 11:13 PM, Duy Nguyen pclo...@gmail.com wrote: diff --git a/setup.c b/setup.c index e59146b..6cf2bc6 100644 --- a/setup.c +++ b/setup.c @@ -5,24 +5,37 @@ static int inside_git_dir = -1; static int inside_work_tree = -1; -char *prefix_path_gently(const char

Re: [PATCH v2] Fix revision walk for commits with the same dates

2013-03-23 Thread Eric Sunshine
On Fri, Mar 22, 2013 at 2:38 PM, Kacper Kornet drae...@pld-linux.org wrote: Logic in still_interesting function allows to stop the commits traversing if the oldest processed commit is not older then the s/then/than/ youngest commit on the list to process and the list contains only commits

Re: [PATCH] checkout: avoid unncessary match_pathspec calls

2013-03-23 Thread Eric Sunshine
On Sat, Mar 23, 2013 at 6:55 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: checkout: avoid unncessary match_pathspec calls s/unncessary/unnecessary/ In checkout_paths() we do this ... -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [RFC] test-lib.sh: No POSIXPERM for cygwin

2013-03-23 Thread Eric Sunshine
On Sat, Mar 23, 2013 at 8:40 AM, Torsten Bögershausen tbo...@web.de wrote: Subject: [PATCH] Make core.sharedRepository work under cygwin 1.7 When core.sharedRepository is used, set_shared_perm() in path.c needs lstat() to return the correct POSIX permissions. The default for cygwin is

Re: [PATCH] checkout: add --sparse for restoring files in sparse checkout mode

2013-03-24 Thread Eric Sunshine
On Sun, Mar 24, 2013 at 1:06 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 8edcdca..45a2b53 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -180,6 +180,13 @@ branch by

Re: [PATCH v9 5/5] Speed up log -L... -M

2013-03-24 Thread Eric Sunshine
On Sat, Mar 23, 2013 at 5:04 AM, Jeff King p...@peff.net wrote: On Sat, Mar 23, 2013 at 06:58:48AM +0100, Thomas Rast wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Thu, Mar 21, 2013 at 8:52 AM, Thomas Rast tr...@student.ethz.ch wrote: This is a bit hacky and should really

Re: [PATCH] user-manual: Fix the interactive rebase example commit range

2013-03-24 Thread Eric Sunshine
On Sun, Mar 24, 2013 at 8:23 AM, W. Trevor King wk...@tremily.us wrote: 6c26bf4 (user-manual: Reorganize the reroll sections, adding 'git rebase -i', 2013-02-19) used deadbee as the oldest commit in the pick list, but as the final commit in the rebased range, due to sloppy duplication and

Re: [PATCH v2 3/3] git-merge-one-file: revise merge error reporting

2013-03-25 Thread Eric Sunshine
On Mon, Mar 25, 2013 at 1:17 PM, Junio C Hamano gits...@pobox.com wrote: Subject: [PATCH] merge-one-file: force content conflict for both side added case s/both side/both sides/ Historically, we tried to be lenient to both side added, slightly Ditto. differently case and as long as the

Re: [PATCH 6/9] streaming_write_entry: propagate streaming errors

2013-03-25 Thread Eric Sunshine
On Mon, Mar 25, 2013 at 4:22 PM, Jeff King p...@peff.net wrote: diff --git a/entry.c b/entry.c index 17a6bcc..002b2f2 100644 --- a/entry.c +++ b/entry.c @@ -126,8 +126,10 @@ static int streaming_write_entry(struct cache_entry *ce, char *path, fd = open_output_fd(path, ce,

Re: [PATCH 6/6] t: check that a pattern without trailing slash matches a directory

2013-03-28 Thread Eric Sunshine
On Thu, Mar 28, 2013 at 5:50 PM, Jeff King p...@peff.net wrote: A pattern subdir should match any path subdir, whether it is a directory or a non-diretory. A pattern subdir/ insists that a s/diretory/directory/ [1] path subdir must be a directory for it to match. [1]:

Re: [PATCH 1/3] send-email: use return; not return undef; on error codepaths

2013-03-31 Thread Eric Sunshine
On Sun, Mar 31, 2013 at 9:40 PM, Junio C Hamano gits...@pobox.com wrote: All the callers of ask, extract_valid_address, and validate_patch subroutines assign the return values from them to a single scaler: s/scaler/scalar/g (note the /g) $var = subr(...); and return undef; in

Re: [PATCH 2/3] send-email: drop misleading function prototype

2013-03-31 Thread Eric Sunshine
On Sun, Mar 31, 2013 at 9:40 PM, Junio C Hamano gits...@pobox.com wrote: The subroutine check_file_rev_conflict() is called from two places, both of which expects to pass a single scaler variable and see if s/scaler/scalar/g (note the /g) that can be interpreted as a pathname or a revision

Re: [PATCH V3 5/5] Help doc: Include --guide option description

2013-04-02 Thread Eric Sunshine
On Tue, Apr 2, 2013 at 6:39 PM, Philip Oakley philipoak...@iee.org wrote: OPTIONS --- -a:: --all:: Prints all the available commands on the standard output. This - option supersedes any other option. + option overides any given command or guide name.

Re: [PATCH V3 4/5] Help.c: add list_common_guides_help() function

2013-04-02 Thread Eric Sunshine
On Tue, Apr 2, 2013 at 6:39 PM, Philip Oakley philipoak...@iee.org wrote: Re-use list_common_cmds_help but simply change the array name. Candidate for future refactoring to pass a pointer to the array. The common-guides.h list was generated with a simple variant of the generate-cmdlist.sh and

Re: [PATCH 2/2] optimize adjust_shared_perm() in path.c:

2013-04-02 Thread Eric Sunshine
On Sat, Mar 30, 2013 at 5:53 AM, Torsten Bögershausen tbo...@web.de wrote: sometimes the chown() function is called even when not needed. (This can be provoced by running t1301, and adding some debug code) s/provoced/provoked/ Save a chmod from 400 to 400, or from 600-600 on these files:

<    1   2   3   4   5   6   7   8   9   10   >