Re: [RFC 2] systemd socket activation support

2015-04-02 Thread Eric Sunshine
On Thu, Apr 2, 2015 at 12:15 PM, Shawn Landden sh...@churchofgit.com wrote: [RFC 2] systemd socket activation support Rephrase this as: [PATCH/RFC v2] daemon: add systemd support systemd support git-daemon's --inetd mode as well. Unable to make sense of this sentence (fragment). A better

Re: [v7 PATCH] daemon: add systemd support

2015-04-08 Thread Eric Sunshine
On Wed, Apr 8, 2015 at 3:14 PM, Shawn Landden sh...@churchofgit.com wrote: [v7 PATCH] daemon: add systemd support git-daemon's --systemd mode allows git-daemon to be connect-activated on one or more addresses or ports. Unlike --inetd[1], git-daemon is not spawned for every connection.

Re: [PATCH v7 4/4] t1006: add tests for git cat-file --literally

2015-04-08 Thread Eric Sunshine
On Wed, Apr 8, 2015 at 1:42 PM, karthik nayak karthik@gmail.com wrote: On 04/08/2015 02:19 AM, Eric Sunshine wrote: On Sat, Apr 4, 2015 at 1:44 AM, Karthik Nayak karthik@gmail.com wrote: Signed-off-by: Karthik Nayak karthik@gmail.com --- diff --git a/t/t1006-cat-file.sh b/t

Re: [PATCH v9 3/5] generate-cmdlist: parse common group commands

2015-05-20 Thread Eric Sunshine
On Wed, May 20, 2015 at 3:27 PM, Sébastien Guimmara sebastien.guimm...@gmail.com wrote: On 05/20/2015 09:22 PM, Sébastien Guimmara wrote: From: Eric Sunshine sunsh...@sunshineco.com It looks like 'git send-email' got confused with the CC field. I'm sorry for that. Confused in what way

Re: [PATCH v9 2/5] command-list.txt: add the common groups block

2015-05-20 Thread Eric Sunshine
On Wed, May 20, 2015 at 3:22 PM, Sébastien Guimmara sebastien.guimm...@gmail.com wrote: The ultimate goal is for git help to display common commands in groups rather than alphabetically. As a first step, define the groups in a new block, and then assign a group to each common command. Add a

Re: [PATCH 2/4] ref-filter: add ref-filter API

2015-05-20 Thread Eric Sunshine
On Wed, May 20, 2015 at 9:18 AM, Karthik Nayak karthik@gmail.com wrote: add a ref-filter API to provide functions to filter refs for listing. This will act as a common library for commands like 'tag -l', 'branch -l' and 'for-each-ref'. ref-filter will enable each of these commands to

Re: [PATCH v9 0/5] group common commands by theme

2015-05-20 Thread Eric Sunshine
On Wed, May 20, 2015 at 3:22 PM, Sébastien Guimmara sebastien.guimm...@gmail.com wrote: The major modification of this reroll [1] is the use of the perl version of generate-cmdlist instead of the awk one. help.c: 1. change the introductory message from: The typical Git workflow

Re: [PATCH/RFCv2 2/2] git rebase -i: warn about removed commits

2015-06-03 Thread Eric Sunshine
On Wednesday, June 3, 2015, Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Check if commits were removed (i.e. a line was deleted) and print warnings or abort git rebase depending on the value of the configuration variable rebase.missingCommits. A few comments below in addition

Re: [RFC] send-email aliases when editing patches or using --xx-cmd

2015-06-04 Thread Eric Sunshine
On Thu, Jun 4, 2015 at 5:11 PM, Stefan Beller sbel...@google.com wrote: On Thu, Jun 4, 2015 at 1:17 PM, Remi LESPINET remi.lespi...@ensimag.grenoble-inp.fr wrote: Working on git-send-email, I've seen that there's no aliases support when manually adding a recipient in a 'To' or 'Cc' field in a

[PATCH] utf8: NO_ICONV: silence uninitialized variable warning

2015-06-05 Thread Eric Sunshine
. When called like this: int n; char *s = reencode_string_len(..., n); if (s) do_something(s, n); some compilers complain that 'n' is used uninitialized within the conditional. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- utf8.h | 4 +++- 1 file changed, 3

Re: Suggestion: make git checkout safer

2015-06-05 Thread Eric Sunshine
On Fri, Jun 5, 2015 at 5:32 AM, Ed Avis e...@waniasset.com wrote: Torsten Bögershausen tboegi at web.de writes: Do you think you can write a patch to improve the documentation ? Here is my attempt, but it is only a starting point. diff --git a/Documentation/git-checkout.txt

Re: Suggestion: make git checkout safer

2015-06-05 Thread Eric Sunshine
On Fri, Jun 5, 2015 at 1:44 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Jun 5, 2015 at 5:32 AM, Ed Avis e...@waniasset.com wrote: Torsten Bögershausen tboegi at web.de writes: Do you think you can write a patch to improve the documentation ? Here is my attempt, but it is only

Re: Suggestion: add author info to TODO list in git-rebase--interactive

2015-06-05 Thread Eric Sunshine
On Fri, Jun 5, 2015 at 3:35 PM, Junio C Hamano gits...@pobox.com wrote: Mike Rappazzo rappa...@gmail.com writes: I find that If I am doing a rebase with the intention to squash or re-order commits, it is helpful to know the commit author. There is not a fundamental reason why the remainder of

Re: [PATCH 1/2] git-bisect.sh : create a file if the bisection is in old/new mode, named BISECT_OLDNEWMODE, so it can easily be seen outside the program without having to read BISECT_TERMS. This wil

2015-06-05 Thread Eric Sunshine
On Fri, Jun 5, 2015 at 12:34 PM, Louis Stuber stub...@ensimag.grenoble-inp.fr wrote: git-bisect.sh : create a file if the bisection is in old/new mode, named BISECT_OLDNEWMODE, so it can easily be seen outside the program without having to read BISECT_TERMS. This will have to be changed in

Re: [PATCH 2/2] Fix git rev-list --bisect and git bisect visualize when the bisection is done in old/new mode.

2015-06-05 Thread Eric Sunshine
On Fri, Jun 5, 2015 at 12:34 PM, Louis Stuber stub...@ensimag.grenoble-inp.fr wrote: Fix git rev-list --bisect and git bisect visualize when the bisection is done in old/new mode. See my review of patch 1/2 regarding writing a good commit message. In particular, explain what is broken about git

Re: [PATCH 1/2] ewah/bitmap: silence warning about MASK macro redefinition

2015-06-03 Thread Eric Sunshine
On Wed, Jun 3, 2015 at 2:39 AM, Jeff King p...@peff.net wrote: From: Eric Sunshine sunsh...@sunshineco.com On PowerPC Mac OS X (10.5.8 Leopard with Xcode 3.1), system header /usr/include/ppc/param.h[1] pollutes the preprocessor namespace with a macro generically named MASK. This conflicts

Re: [PATCH 2/2] ewah: use less generic macro name

2015-06-03 Thread Eric Sunshine
p...@peff.net Yeah, splitting the patches this way makes sense and feels a bit cleaner. It's such a simple patch that it doesn't need a reviewed-by, but for what it's worth... Reviewed-by: Eric Sunshine sunsh...@sunshineco.com -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH] ewah/bitmap: silence warning about MASK macro redefinition

2015-06-03 Thread Eric Sunshine
: s/\[1\]// pollutes the preprocessor namespace with a macro generically named MASK. We can give these macros more specific names, as well, to avoid this conflict. Reported-and-analyzed-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Jeff King p...@peff.net --- I'm also happy

Re: [PATCH 7/9] strbuf_getwholeline: use getdelim if it is available

2015-06-02 Thread Eric Sunshine
On Fri, May 8, 2015 at 9:09 PM, Jeff King p...@peff.net wrote: On Fri, May 08, 2015 at 07:56:28PM -0400, Eric Sunshine wrote: I spent some time downloading old Xcode releases and poking through the packages. Xcode 3.2.x seems to be the last in the Xcode 3 series, and none of the Xcode 3.2.x

[PATCH 1/2] config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases

2015-06-02 Thread Eric Sunshine
available for download, or not available to non-paying developers, so testing is not possible. [2]: http://en.wikipedia.org/wiki/Xcode Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Tested on OS X 10.10.3 Yosemite with Xcode 6.3.2 and OS X 10.5.8 Leopard with Xcode 3.1. The use

[PATCH 2/2] configure: add getdelim() check

2015-06-02 Thread Eric Sunshine
As an optimization, strbuf will take advantage of getdelim() if available, so add a configure check which defines HAVE_GETDELIM if found. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Tested on: * OS X 10.10.3 Yosemite with Xcode 6.3.2 * OS X 10.5.8 Leopard with Xcode 3.1 * Linux

[PATCH 0/2] auto-detect getdelim()

2015-06-02 Thread Eric Sunshine
a configure script check. Eric Sunshine (2): config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases configure: add getdelim() check config.mak.uname | 3 +++ configure.ac | 6 ++ 2 files changed, 9 insertions(+) -- 2.4.2.598.gb4379f4 -- To unsubscribe from

Re: [PATCH 1/2] config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases

2015-06-02 Thread Eric Sunshine
On Tue, Jun 2, 2015 at 3:04 PM, Jeff King p...@peff.net wrote: On Tue, Jun 02, 2015 at 02:44:13PM -0400, Jeff King wrote: + ifeq ($(shell expr $(shell expr $(uname_R) : '\([0-9][0-9]*\)\.') '=' 11),1) Do you need to spawn two shells? It seems like: $(shell expr `expr $(uname_R) :

Re: [PATCH 1/2] config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases

2015-06-02 Thread Eric Sunshine
On Tue, Jun 2, 2015 at 4:01 PM, Jeff King p...@peff.net wrote: On Tue, Jun 02, 2015 at 03:57:44PM -0400, Eric Sunshine wrote: Oops, I missed the trailing '.' in the regex there, and it probably needs double-quotes in case the inner expr fails to match anything. Which is messy considering

Re: [RFCv2 14/16] t5544: add a test case for the new protocol

2015-06-02 Thread Eric Sunshine
On Mon, Jun 1, 2015 at 8:02 PM, Stefan Beller sbel...@google.com wrote: Signed-off-by: Stefan Beller sbel...@google.com --- diff --git a/t/t5544-fetch-2.sh b/t/t5544-fetch-2.sh new file mode 100755 index 000..beee46c --- /dev/null +++ b/t/t5544-fetch-2.sh @@ -0,0 +1,40 @@ +#!/bin/sh

[PATCH v2 2/2] configure: add getdelim() check

2015-06-02 Thread Eric Sunshine
As an optimization, strbuf will take advantage of getdelim() if available, so add a configure check which defines HAVE_GETDELIM if found. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- configure.ac | 6 ++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac

[PATCH v2 1/2] config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases

2015-06-02 Thread Eric Sunshine
available for download, or not available to non-paying developers, so testing is not possible. [2]: http://en.wikipedia.org/wiki/Xcode Helped-by: Jeff King p...@peff.net Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- config.mak.uname | 3 +++ 1 file changed, 3 insertions(+) diff

[PATCH v2 0/2] auto-detect getdelim()

2015-06-02 Thread Eric Sunshine
-- unchanged [1]: http://thread.gmane.org/gmane.comp.version-control.git/270576 Eric Sunshine (2): config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases configure: add getdelim() check config.mak.uname | 3 +++ configure.ac | 6 ++ 2 files changed, 9 insertions

[PATCH] ewah/bitmap: silence warning about MASK macro redefinition

2015-06-02 Thread Eric Sunshine
/sysctl.h - sys/ucred.h - sys/param.h - machine/param.h - ppc/param.h Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- The alternative is to rename MASK in ewah/bitmap.c to something less generic, resulting in a slightly more noisy patch. I chose the #undef approach since it's

Re: [PATCH v7 3/5] bisect: simplify the addition of new bisect terms

2015-06-23 Thread Eric Sunshine
On Tue, Jun 23, 2015 at 8:54 AM, Matthieu Moy matthieu@imag.fr wrote: diff --git a/revision.c b/revision.c index 3ff8723..f22923f 100644 --- a/revision.c +++ b/revision.c @@ -2076,14 +2079,32 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

2015-06-23 Thread Eric Sunshine
On Mon, Jun 22, 2015 at 5:42 PM, Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Instead of removing a line to remove the commit, you can use the command drop (just like pick or edit). It has the same effect as deleting the line (removing the commit) except that you keep a visual

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

2015-06-23 Thread Eric Sunshine
On Tue, Jun 23, 2015 at 3:01 PM, Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Eric Sunshine sunsh...@sunshineco.com writes: +test_rebase_end () { + test_when_finished git checkout master + git branch -D $1 + test_might_fail git rebase --abort

Re: [PATCH v4 03/19] ref-filter: implement '--points-at' option

2015-06-22 Thread Eric Sunshine
On Sun, Jun 21, 2015 at 4:48 PM, Karthik Nayak karthik@gmail.com wrote: In 'tag -l' we have '--points-at' option which lets users list only tags which point to a particular commit. Implement this option in 'ref-filter.{c,h}' so that other commands can benefit from this. This is

Re: [PATCH v4 07/19] for-each-ref: add '--merged' and '--no-merged' options

2015-06-22 Thread Eric Sunshine
On Sun, Jun 21, 2015 at 4:48 PM, Karthik Nayak karthik@gmail.com wrote: Add the '--merged' and '--no-merged' options provided by 'ref-filter'. The '--merged' option lets the user to only list refs merged into the named commit. The '--no-merged' option lets the user to only list refs not

Re: [PATCH v4 04/19] for-each-ref: add '--points-at' option

2015-06-22 Thread Eric Sunshine
On Sun, Jun 21, 2015 at 4:48 PM, Karthik Nayak karthik@gmail.com wrote: Add the '--points-at' option provided by 'ref-filter'. The option lets the user to pick only refs which point to a particular commit. Add documentation and tests for the same. Based-on-patch-by: Jeff King

Re: [PATCH 1/3] contrib/subtree: Use tabs consitently for indentation in tests

2015-06-22 Thread Eric Sunshine
On Mon, Jun 22, 2015 at 9:53 AM, Charles Bailey char...@hashpling.org wrote: contrib/subtree: Use tabs consitently for indentation in tests s/consitently/consistently/ Although subtrees tests uses more spaces for indentation than tabs, there are still quite a lot of lines indented with tabs.

Re: Sporadic test failures on OSX 10.10.3

2015-06-22 Thread Eric Sunshine
On Sat, Jun 20, 2015 at 5:47 AM, Heiko Voigt hvo...@hvoigt.net wrote: I am currently experiencing sporadic test failures on Mac OS X 10.10.3: Test Summary Report --- t7503-pre-commit-hook.sh (Wstat: 256 Tests: 11 Failed: 1) Failed test: 9

Re: [PATCH 7/7] cat-file: add --batch-all-objects option

2015-06-26 Thread Eric Sunshine
On Mon, Jun 22, 2015 at 6:45 AM, Jeff King p...@peff.net wrote: [...] This patch adds an option to cat-file --batch-check to operate on all available objects (rather than reading names from stdin). Signed-off-by: Jeff King p...@peff.net --- diff --git a/t/t1006-cat-file.sh

Re: [PATCH v7 2/5] setup: sanity check file size in read_gitfile_gently

2015-06-13 Thread Eric Sunshine
On Tue, Jun 9, 2015 at 2:24 PM, Erik Elfström erik.elfst...@gmail.com wrote: read_gitfile_gently will allocate a buffer to fit the entire file that should be read. Add a sanity check of the file size before opening to avoid allocating a potentially huge amount of memory if we come across a

Re: 'git status -z' missing separators on OSX

2015-06-17 Thread Eric Sunshine
On Tue, Jun 16, 2015 at 11:32 PM, Jeff King p...@peff.net wrote: On Tue, Jun 16, 2015 at 06:21:56PM -0500, Tad Hardesty wrote: ~/test (master #)$ git status -z | hexdump -C 41 20 20 61 41 20 20 62 |A aA b| 0008 That's really weird. I don't have a

Re: [PATCH] Fix power checking on OS X

2015-06-12 Thread Eric Sunshine
On Fri, Jun 12, 2015 at 4:53 AM, Panagiotis Astithas past...@gmail.com wrote: On Fri, Jun 12, 2015 at 6:46 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas past...@gmail.com wrote: The output of pmset -g batt changed at some point from

Re: [PATCH] Fix power checking on OS X

2015-06-11 Thread Eric Sunshine
On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas past...@gmail.com wrote: The output of pmset -g batt changed at some point from Currently drawing from 'AC Power' to the slightly different Now drawing from 'AC Power'. Starting the match from drawing makes the check work in both old and

Re: [PATCH v7 2/5] setup: sanity check file size in read_gitfile_gently

2015-06-14 Thread Eric Sunshine
On Sun, Jun 14, 2015 at 1:21 PM, erik elfström erik.elfst...@gmail.com wrote: On Sun, Jun 14, 2015 at 5:42 AM, Eric Sunshine sunsh...@sunshineco.com wrote: This variable name doesn't convey much about its purpose, and introduces a bit of maintenance burden if the limit is some day changed

Re: [PATCH/WIP 4/8] am: split out mbox/maildir patches with git-mailsplit

2015-05-28 Thread Eric Sunshine
On Wed, May 27, 2015 at 9:33 AM, Paul Tan pyoka...@gmail.com wrote: git-am.sh supports mbox, stgit and mercurial patches. Re-implement support for splitting out mbox/maildirs using git-mailsplit, while also implementing the framework required to support other patch formats in the future.

Re: [PATCH 1/3] t4150-am: refactor and clean common setup

2015-05-28 Thread Eric Sunshine
On Tue, May 26, 2015 at 5:32 PM, Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr wrote: Add new functions to keep the setup cleaner: - setup_temporary_branch: creates a new branch, check it out and automatically delete it after the test is over - setup_fixed_branch: creates a fixed

Re: [PATCH 1/3] t4150-am: refactor and clean common setup

2015-05-28 Thread Eric Sunshine
On Thu, May 28, 2015 at 3:09 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Tue, May 26, 2015 at 5:32 PM, Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr wrote: +setup_temporary_branch () { + tmp_name=${2-temporary} I forgot to mention the broken -chain here. Although

Re: [PATCH/RFC] send-email: allow multiple emails using --cc --to and --bcc

2015-05-28 Thread Eric Sunshine
On Thu, May 28, 2015 at 11:26 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Thu, May 28, 2015 at 6:42 AM, Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr wrote: + The format supported for email list is the following: + Foo f...@example.com, b...@example.com

Re: [PATCH 2/2] commit: fix ending newline for template files

2015-05-28 Thread Eric Sunshine
On Thu, May 28, 2015 at 2:22 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: Moreover, it lacks justification and explanation of why you consider the cleanup unnecessary. History [1] indicates that its application to -F but not -t was intentional

Re: [PATCH 1/3] t4150-am: refactor and clean common setup

2015-05-28 Thread Eric Sunshine
On Thu, May 28, 2015 at 9:10 AM, Paul Tan pyoka...@gmail.com wrote: Take these comments/suggestions with a pinch of salt because I'm not that experienced with the code base as well ;-). I agree with pretty much all of your review comments. See below for a minor addenda. On Wed, May 27, 2015

Re: [PATCH/WIP 5/8] am: detect mbox patches

2015-05-31 Thread Eric Sunshine
On Wed, May 27, 2015 at 9:33 AM, Paul Tan pyoka...@gmail.com wrote: Since 15ced75 (git-am foreign patch support: autodetect some patch formats, 2009-05-27), git-am.sh is able to autodetect mbox, stgit and mercurial patches through heuristics. Re-implement support for autodetecting

[PATCH 1/9] send-email: further document missing sendmail aliases functionality

2015-05-31 Thread Eric Sunshine
Sendmail aliases[1] supports expansion to a file (/path/name) or pipe (|command), as well as file inclusion (:include: /path/name), however, our implementation does not support such functionality. [1]: https://www.freebsd.org/cgi/man.cgi?query=aliasessektion=5 Signed-off-by: Eric Sunshine sunsh

[PATCH 2/9] send-email: visually distinguish sendmail aliases parser warnings

2015-05-31 Thread Eric Sunshine
Although emitted to stderr, warnings from the sendmail aliases parser are not visually distinguished as such, and thus can easily be overlooked in the normal noisy send-email output. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- This prepends lowercase warning: rather than uppercase

[PATCH 7/9] send-email: implement sendmail aliases line continuation support

2015-05-31 Thread Eric Sunshine
Logical lines in sendmail aliases files can be spread over multiple physical lines[1]. A line beginning with whitespace is folded into the preceding line. A line ending with '\' consumes the following line. [1]: https://www.freebsd.org/cgi/man.cgi?query=aliasessektion=5 Signed-off-by: Eric

[PATCH 3/9] send-email: drop noise comments which merely repeat what code says

2015-05-31 Thread Eric Sunshine
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- git-send-email.perl | 5 - 1 file changed, 5 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 819f87e..0b18682 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -517,26 +517,21 @@ my %parse_alias

[PATCH 0/9] send-email: add sendmail aliases line continuation support

2015-05-31 Thread Eric Sunshine
This series adds line continuation support for sendmail aliases. It extends basic sendmail aliases functionality implemented by ah/send-email-sendmail-alias (currently d1205b07 in 'pu') Eric Sunshine (9): send-email: further document missing sendmail aliases functionality send-email: visually

[PATCH 6/9] send-email: simplify sendmail aliases comment and blank line recognizer

2015-05-31 Thread Eric Sunshine
Replace unnecessarily complex regular expression for recognizing comment and blanks lines in sendmail aliases with idiomatic expressions which can be easily understood at a glance. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- git-send-email.perl | 2 +- 1 file changed, 1 insertion

[PATCH 4/9] send-email: fix style: cuddle 'elsif' and 'else' with closing brace

2015-05-31 Thread Eric Sunshine
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- git-send-email.perl | 17 + 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 0b18682..1380e6e 100755 --- a/git-send-email.perl +++ b/git-send-email.perl

[PATCH 5/9] send-email: refactor sendmail aliases parser

2015-05-31 Thread Eric Sunshine
The sendmail aliases parser inlined into %parse_alias is already uncomfortably large and is expected to grow as additional functionality is implemented, so extract it to improve manageability. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- git-send-email.perl | 38

[PATCH 9/9] t9001: add sendmail aliases line continuation tests

2015-05-31 Thread Eric Sunshine
A line beginning with whitespace is folded into the preceding line. A line ending with '\' consumes the following line. While here, also test an empty sendmail aliases file. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t9001-send-email.sh | 34 ++ 1

[PATCH 8/9] t9001: refactor sendmail aliases test infrastructure

2015-05-31 Thread Eric Sunshine
Several new tests of sendmail aliases parsing will be added in a subsequent patch, so factor out functionality common to all of them into a new helper function. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t9001-send-email.sh | 47 +-- 1

Re: [PATCH 6/9] send-email: simplify sendmail aliases comment and blank line recognizer

2015-05-31 Thread Eric Sunshine
On Sun, May 31, 2015 at 6:29 PM, Eric Sunshine sunsh...@sunshineco.com wrote: Replace unnecessarily complex regular expression for recognizing comment and blanks lines in sendmail aliases with idiomatic expressions which s/blanks/blank/ can be easily understood at a glance. Signed-off

Re: [PATCH 1/9] send-email: further document missing sendmail aliases functionality

2015-06-01 Thread Eric Sunshine
On Mon, Jun 01, 2015 at 07:43:08AM -0400, Allen Hubbe wrote: On May 31, 2015 at 6:29 PM, Eric Sunshine sunsh...@sunshineco.com wrote: Sendmail aliases[1] supports expansion to a file (/path/name) or pipe (|command), as well as file inclusion (:include: /path/name), however, our

Re: Bug in 'git am' when applying a broken patch

2015-06-01 Thread Eric Sunshine
On Mon, Jun 1, 2015 at 2:58 PM, Junio C Hamano gits...@pobox.com wrote: Subject: apply: reject a hunk that does not do anything A hunk like this in a hand-edited patch without correctly adjusting the line counts: @@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentic...

Re: [PATCH/RFCv2 2/2] git rebase -i: warn about removed commits

2015-06-01 Thread Eric Sunshine
On Mon, Jun 1, 2015 at 7:52 AM, Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Check if commits were removed (i.e. a line was deleted) and print warnings or abort git rebase according to the value of the configuration variable rebase.checkLevel. Add the configuration variable

Re: [PATCH/RFCv2 2/2] git rebase -i: warn about removed commits

2015-06-01 Thread Eric Sunshine
On Mon, Jun 1, 2015 at 7:16 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Jun 1, 2015 at 7:52 AM, Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: test_expect_success 'drop' ' - git checkout master test_when_finished git checkout master git

Re: [RFC/WIP PATCH 04/11] upload-pack-2: Implement the version 2 of upload-pack

2015-05-27 Thread Eric Sunshine
On Wed, May 27, 2015 at 2:35 AM, Jeff King p...@peff.net wrote: On Tue, May 26, 2015 at 03:01:08PM -0700, Stefan Beller wrote: +static void send_capabilities(void) +{ + char buf[100]; + + while (next_capability(buf)) + packet_write(1, capability:%s\n, buf); Like Eric,

Re: [RFC/WIP PATCH 06/11] remote.h: add get_remote_capabilities, request_capabilities

2015-05-27 Thread Eric Sunshine
On Wed, May 27, 2015 at 2:50 AM, Jeff King p...@peff.net wrote: On Tue, May 26, 2015 at 11:25:05PM -0400, Eric Sunshine wrote: + len = packet_read(in, src_buf, src_len, + packet_buffer, sizeof(packet_buffer

Re: [PATCH/RFC 2/2] git rebase -i: Warn removed or dupplicated commits

2015-05-27 Thread Eric Sunshine
On Wed, May 27, 2015 at 9:19 AM, Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Eric Sunshinesunsh...@sunshineco.com writes: + # To uppercase + checkLevel=$(echo $checkLevel | tr '[:lower:]' '[:upper:]') Is there precedence elsewhere for recognizing

Re: [RFC/WIP PATCH 04/11] upload-pack-2: Implement the version 2 of upload-pack

2015-05-26 Thread Eric Sunshine
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller sbel...@google.com wrote: In upload-pack-2 we send each capability in its own packet. By reusing the advertise_capabilities and eventually setting it to NULL we will be able to reuse the methods for refs advertisement. Signed-off-by: Stefan

Re: [RFC/WIP PATCH 06/11] remote.h: add get_remote_capabilities, request_capabilities

2015-05-26 Thread Eric Sunshine
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller sbel...@google.com wrote: Instead of calling get_remote_heads as a first command during the protocol exchange, we need to have fine grained control over the capability negotiation in version 2 of the protocol. Introduce get_remote_capabilities,

Re: [RFC/WIP PATCH 08/11] transport: connect_setup appends protocol version number

2015-05-26 Thread Eric Sunshine
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller sbel...@google.com wrote: Signed-off-by: Stefan Beller sbel...@google.com --- diff --git a/transport.c b/transport.c index 3ef15f6..33644a6 100644 --- a/transport.c +++ b/transport.c @@ -496,15 +496,29 @@ static int set_git_option(struct

Re: [RFC/WIP PATCH 09/11] transport: get_refs_via_connect exchanges capabilities before refs.

2015-05-26 Thread Eric Sunshine
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller sbel...@google.com wrote: transport: get_refs_via_connect exchanges capabilities before refs. s/exchanges/exchange/ s/\.$// Signed-off-by: Stefan Beller sbel...@google.com --- transport.c | 29 + 1 file changed, 25

Re: [RFC/WIP PATCH 10/11] t5544: add a test case for the new protocol

2015-05-26 Thread Eric Sunshine
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller sbel...@google.com wrote: Signed-off-by: Stefan Beller sbel...@google.com --- diff --git a/t/t5544-fetch-2.sh b/t/t5544-fetch-2.sh new file mode 100755 index 000..beee46c --- /dev/null +++ b/t/t5544-fetch-2.sh @@ -0,0 +1,40 @@ +#!/bin/sh

Re: [PATCH 2/2] commit: fix ending newline for template files

2015-05-29 Thread Eric Sunshine
On Fri, May 29, 2015 at 4:17 PM, Junio C Hamano gits...@pobox.com wrote: By default, we should run clean-up after the editor we spawned gives us the edited result. Not adding one more LF after the template when it already ends with LF would not hurt, but an extra blank after the template

Re: [PATCH 2/2] commit: fix ending newline for template files

2015-05-30 Thread Eric Sunshine
On Sat, May 30, 2015 at 7:29 AM, Patryk Obara patryk.ob...@gmail.com wrote: On Thu, May 28, 2015 at 4:29 PM, Eric Sunshine sunsh...@sunshineco.com wrote: Did you consider the alternate approach of handling newline processing immediately upon loading 'logfile' and 'template_file', rather than

Re: [WIP/PATCH v4 8/8] ref-filter: add 'ref-filter.h'

2015-05-30 Thread Eric Sunshine
On Sat, May 30, 2015 at 1:53 PM, Karthik Nayak karthik@gmail.com wrote: Create 'ref-filter.h', also add ref-filter to the Makefile. This completes movement of creation of 'ref-filter' from 'for-each-ref'. It's important that the project can be built successfully and function correctly at

Re: [WIP/PATCH v4 4/8] for-each-ref: introduce new structures for better organisation

2015-05-30 Thread Eric Sunshine
On Sat, May 30, 2015 at 1:53 PM, Karthik Nayak karthik@gmail.com wrote: Intoduce 'ref_filter_cbdata' which will hold 'ref_filter' s/Intoduce/Introduce/ (Conditions to filter the refs on) and 'ref_array' (The array s/Conditions/conditions/ s/The/the/ of ref_array_items). Modify the code

Re: [WIP/PATCH v4 1/8] for-each-ref: extract helper functions out of grab_single_ref()

2015-05-30 Thread Eric Sunshine
On Sat, May 30, 2015 at 1:53 PM, Karthik Nayak karthik@gmail.com wrote: Extract two helper functions out of grab_single_ref(). Firstly, new_refinfo() which is used to allocate memory for a new refinfo structure and copy the objectname, refname and flag to it. Secondly, match_name_as_path()

Re: [WIP/PATCH v4 6/8] for-each-ref: rename some functions and make them public

2015-05-30 Thread Eric Sunshine
On Sat, May 30, 2015 at 1:53 PM, Karthik Nayak karthik@gmail.com wrote: Rename some of the functions and make them publically available. s/publically/publicly/ This is a preparatory step for moving code from 'for-each-ref' to 'ref-filter' to make meaningful, targeted services available to

Re: [WIP/PATCH v4 8/8] ref-filter: add 'ref-filter.h'

2015-05-31 Thread Eric Sunshine
On Sun, May 31, 2015 at 4:19 AM, Karthik Nayak karthik@gmail.com wrote: On 05/31/2015 09:13 AM, Eric Sunshine wrote: On Sat, May 30, 2015 at 1:53 PM, Karthik Nayak karthik@gmail.com wrote: Create 'ref-filter.h', also add ref-filter to the Makefile. This completes movement of creation

Re: [PATCH 1/2] t750*: make tests for commit messages more pedantic

2015-05-28 Thread Eric Sunshine
On Tue, May 26, 2015 at 2:15 AM, Patryk Obara patryk.ob...@gmail.com wrote: Currently messages are compared with --pretty=format:%s%b which does not retain raw format of commit message. In result it's not clear what part of expected commit msg is subject and what part is body. Also, it's

Re: [PATCH 2/2] commit: fix ending newline for template files

2015-05-28 Thread Eric Sunshine
On Tue, May 26, 2015 at 2:15 AM, Patryk Obara patryk.ob...@gmail.com wrote: git-commit with -t or -F -e uses content of user-supplied file as initial value for commit msg in editor. There is no guarantee, that this file ends with newline - it depends on file content and editor used to create

Re: [PATCH/RFC] send-email: allow multiple emails using --cc --to and --bcc

2015-05-28 Thread Eric Sunshine
On Thu, May 28, 2015 at 6:42 AM, Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr wrote: Add the possibility to use a list of emails separated by commas in flags --cc --to and --bcc instead of having to use one flag s/--cc --to/--cc, --to/ Ditto in subject. per email address. The

Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

2015-06-02 Thread Eric Sunshine
On Tue, Jun 2, 2015 at 9:52 AM, Remi LESPINET remi.lespi...@ensimag.grenoble-inp.fr wrote: Matthieu Moy matthieu@grenoble-inp.fr writes: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes: +if test $(git config --bool --get am.threeWay) = true +then +threeway=t +fi I

Re: [PATCH/RFCv2 2/2] git rebase -i: warn about removed commits

2015-06-02 Thread Eric Sunshine
On Tue, Jun 2, 2015 at 3:42 AM, Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Eric Sunshine sunsh...@sunshineco.com writes: +test_expect_success 'rebase -i respects rebase.checkLevel' ' + test_config rebase.checkLevel error + test_when_finished git

Re: [RFCv2 01/16] stringlist: add from_space_separated_string

2015-06-02 Thread Eric Sunshine
On Tue, Jun 2, 2015 at 5:42 AM, Duy Nguyen pclo...@gmail.com wrote: On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote: diff --git a/string-list.h b/string-list.h index d3809a1..88c18e9 100644 --- a/string-list.h +++ b/string-list.h @@ -19,6 +19,7 @@ struct string_list {

Re: [PATCH v5 3/4] status: give more information during rebase -i

2015-07-01 Thread Eric Sunshine
On Wed, Jul 1, 2015 at 12:36 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: I was about to mention the same shortcoming, but you beat me to it. Perhaps be more strict and do this instead (without leading strbuf_trim): if (!get_sha1_hex

Re: [RFC/PATCH] worktree: replace checkout --to with worktree new

2015-07-01 Thread Eric Sunshine
On Wed, Jul 1, 2015 at 1:13 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, Jul 1, 2015 at 12:53 PM, Junio C Hamano gits...@pobox.com wrote: * Duy seems to think worktree add is coming, too, so here is a trivial tweak of your patch from the last month, with test adjustments

Re: [PATCH v6 6/7] git-reflog: add create and exists functions

2015-06-30 Thread Eric Sunshine
On Mon, Jun 29, 2015 at 4:17 PM, David Turner dtur...@twopensource.com wrote: These are necessary because alternate ref backends might store reflogs somewhere other than .git/logs. Code that now directly manipulates .git/logs should instead go through git-reflog. In a moment, we will use

Re: [PATCH v5 3/4] status: give more information during rebase -i

2015-07-01 Thread Eric Sunshine
On Wed, Jul 1, 2015 at 12:18 PM, Junio C Hamano gits...@pobox.com wrote: Matthieu Moy matthieu@imag.fr writes: +/* + * Turn + * pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message + * into + * pick d6a2f03 some message + */ +static void abbrev_sha1_in_line(struct strbuf *line)

Re: [PATCH v2 07/23] Documentation/git-worktree: add EXAMPLES section

2015-07-03 Thread Eric Sunshine
On Fri, Jul 3, 2015 at 8:17 PM, Eric Sunshine sunsh...@sunshineco.com wrote: Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- +EXAMPLES + +You are middle of a refactoring session and your boss comes in and demands s/middle/in the / +that you fix something immediately. You

Re: [PATCH v2 19/23] checkout: require worktree unconditionally

2015-07-03 Thread Eric Sunshine
On Fri, Jul 3, 2015 at 8:17 PM, Eric Sunshine sunsh...@sunshineco.com wrote: In order to allow linked worktree creation via git checkout -b from a s/-b/--to/ bare repository, 3473ad0 (checkout: don't require a work tree when checking out into a new one, 2014-11-30) dropped git-checkout's

[PATCH v2 13/23] worktree: introduce add command

2015-07-03 Thread Eric Sunshine
functionality (checkout.c:prepare_linked_checkout() and its helpers) to worktree.c. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Documentation/git-worktree.txt | 21 +++-- builtin/worktree.c | 32 2 files changed, 43 insertions

[PATCH v2 10/23] checkout: prepare_linked_checkout: drop now-unused 'new' argument

2015-07-03 Thread Eric Sunshine
The only references to 'new' were folded out by the last two patches. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- builtin/checkout.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 0cb81ee..0dcdde2 100644

[PATCH v2 23/23] checkout: retire --ignore-other-worktrees in favor of --force

2015-07-03 Thread Eric Sunshine
to mind. Therefore, overload it to also suppress the check for a branch already checked out elsewhere. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- I plopped this patch at the end of the series so that it can be dropped easily if desired since Junio indicated[1] that he would moderately

[PATCH v2 20/23] worktree: extract basename computation to new function

2015-07-03 Thread Eric Sunshine
A subsequent patch will also need to compute the basename of the new worktree, so factor out this logic into a new function. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- builtin/worktree.c | 29 - 1 file changed, 20 insertions(+), 9 deletions(-) diff

[PATCH v2 18/23] checkout: retire --to option

2015-07-03 Thread Eric Sunshine
GIT_CHECKOUT_NEW_WORKTREE environment variable). Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- builtin/checkout.c | 156 + builtin/worktree.c | 138 --- 2 files changed, 133 insertions(+), 161

[PATCH v2 15/23] worktree: add --detach option

2015-07-03 Thread Eric Sunshine
One of git-worktree's roles is to populate the new worktree, much like git-checkout, and thus, for convenience, ought to support several of the same shortcuts. Toward this goal, add a --detach option to detach HEAD in the new worktree. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com

[PATCH v2 22/23] worktree: add: auto-vivify new branch when branch is omitted

2015-07-03 Thread Eric Sunshine
../hotfix. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Documentation/git-worktree.txt | 8 ++-- builtin/worktree.c | 8 ++-- t/t2025-worktree-add.sh| 7 +++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Documentation/git-worktree.txt b

[PATCH v2 14/23] worktree: add --force option

2015-07-03 Thread Eric Sunshine
By default, git worktree add refuses to create a new worktree when the requested branch is already checked out elsewhere. Add a --force option to override this safeguard. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Documentation/git-worktree.txt | 8 +++- builtin/worktree.c

<    7   8   9   10   11   12   13   14   15   16   >