[PATCH v4 0/2] git-multimail: a replacement for post-receive-email

2013-07-14 Thread Michael Haggerty
This is the fourth iteration submission of git-multimail to Git. The earlier submissions have all gotten a lot of good feedback, which has mostly been implemented. This submission differs from v3 in the following ways: * Renames the directory within the Git project from

[PATCH v4 2/2] post-receive-email: deprecate script in favor of git-multimail

2013-07-14 Thread Michael Haggerty
Add a notice to the top of post-receive-email explaining that the script is no longer under active development and pointing the user to git-multimail. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- If you think this is premature or the wording is too strong; feel free to change or omit

[PATCH v2 03/46] pathspec: i18n-ize error strings in pathspec parsing code

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- pathspec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pathspec.c b/pathspec.c index 133f8be..403095b 100644 --- a/pathspec.c +++ b/pathspec.c @@ -167,11 +167,11 @@ static const char *prefix_pathspec(const

[PATCH v2 02/46] Move struct pathspec and related functions to pathspec.[ch]

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- archive.c | 1 + builtin/grep.c | 1 + builtin/ls-files.c | 1 + builtin/ls-tree.c | 1 + builtin/update-index.c | 1 + cache.h| 22 +--- diff.h | 1 + dir.c

[PATCH v2 01/46] clean: remove unused variable seen

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/clean.c | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index 04e396b..f955a40 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -155,7 +155,6 @@ int

[PATCH v2 00/46] struct pathspec conversion and :(glob) and :(icase)

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Compared to the last round [1] this series mainly fixes comments and commit messages suggested by Eric and Junio. It also fixes a conflict with cb/log-follow-with-combined (in master) and introduces :(icase) mentioned in the last round. [1]

[PATCH v2 04/46] pathspec: add copy_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Because free_pathspec wants to free items pointer in the pathspec structure, a simple structure assignment is not enough if you want to copy an existing pathspec into another. Freeing the original will damage the copy unless a deep copy is made. Note that the strings in pathspec-items-match and

[PATCH v2 07/46] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}

2013-07-14 Thread Nguyễn Thái Ngọc Duy
We have two ways of dealing with empty pathspec: 1. limit it to current prefix 2. match the entire working directory Some commands go with #1, some #2. get_pathspec() and parse_pathspec() only support #1. Make parse_pathspec() reject empty pathspec by default. #1 and #2 can be specified via new

[PATCH v2 08/46] Convert some get_pathspec() calls to parse_pathspec()

2013-07-14 Thread Nguyễn Thái Ngọc Duy
These call sites follow the pattern: paths = get_pathspec(prefix, argv); init_pathspec(pathspec, paths); which can be converted into a single parse_pathspec() call. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/grep.c | 6 +++--- builtin/ls-tree.c | 10

[PATCH v2 09/46] parse_pathspec: add special flag for max_depth feature

2013-07-14 Thread Nguyễn Thái Ngọc Duy
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 unwanted activation, e.g. 5c8eeb8 (diff-index: enable recursive pathspec matching in unpack_trees - 2012-01-15).

[PATCH v2 13/46] Guard against new pathspec magic in pathspec matching code

2013-07-14 Thread Nguyễn Thái Ngọc Duy
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 catch unsupported codepaths. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v2 10/46] parse_pathspec: support stripping submodule trailing slashes

2013-07-14 Thread Nguyễn Thái Ngọc Duy
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 --- pathspec.c | 9 + pathspec.h | 2 ++ 2 files changed, 11

[PATCH v2 12/46] parse_pathspec: support prefixing original patterns

2013-07-14 Thread Nguyễn Thái Ngọc Duy
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 launch a subcommand at worktree's top directory and the subcommand can no longer

[PATCH v2 06/46] parse_pathspec: save original pathspec for reporting

2013-07-14 Thread Nguyễn Thái Ngọc Duy
We usually use pathspec_item's match field for pathspec error reporting. However match (or raw) does not show the magic part, which will play more important role later on. Preserve exact user input for reporting. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- dir.c | 1 +

[PATCH v2 05/46] Add parse_pathspec() that converts cmdline args to struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Currently to fill a struct pathspec, we do: const char **paths; paths = get_pathspec(prefix, argv); ... init_pathspec(pathspec, paths); paths can only carry bare strings, which loses information from command line arguments such as pathspec magic or the prefix part's length for each

[PATCH v2 11/46] parse_pathspec: support stripping/checking submodule paths

2013-07-14 Thread Nguyễn Thái Ngọc Duy
PATHSPEC_SYMLINK_LEADING_PATH and _STRIP_SUBMODULE_SLASH_EXPENSIVE are respectively the alternate implementation of pathspec.c:die_if_path_beyond_symlink() and pathspec.c:check_path_for_gitlink(). They are intended to replace those functions when builtin/add.c and builtin/check-ignore.c are

[PATCH v2 14/46] clean: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/clean.c | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index f955a40..fdd4980 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -13,6 +13,7 @@ #include

[PATCH v2 19/46] rm: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/rm.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c index 06025a2..ee0ae4c 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -11,6 +11,7 @@ #include

[PATCH v2 21/46] archive: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- archive.c | 19 +++ archive.h | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/archive.c b/archive.c index c699a2d..99fadc8 100644 --- a/archive.c +++ b/archive.c @@ -5,7 +5,6 @@ #include

[PATCH v2 16/46] status: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/commit.c | 9 + wt-status.c | 16 +++- wt-status.h | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 530f0ed..64d1a3d 100644 ---

[PATCH v2 17/46] rerere: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/rerere.c | 8 +--- rerere.c | 9 + rerere.h | 4 +++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index dc1708e..4e51add 100644 ---

[PATCH v2 20/46] ls-files: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/ls-files.c | 46 +- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 30357df..f1be425 100644 --- a/builtin/ls-files.c +++

[PATCH v2 22/46] check-ignore: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
check-ignore (at least the test suite) seems to rely on the pattern order. PATHSPEC_KEEP_ORDER is introduced to explictly express this. The lack of PATHSPEC_MAXDEPTH_VALID is sufficient because it's the only flag that reorders pathspecs, but it's less obvious that way. Cc: Adam Spiers

[PATCH v2 15/46] commit: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/commit.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 790e5ab..530f0ed 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -284,17 +284,17 @@

[PATCH v2 18/46] checkout: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 34 +- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 7fe0bff..6721de2 100644 --- a/builtin/checkout.c +++

[PATCH v2 31/46] Convert refresh_index to take struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c| 15 +++ builtin/commit.c | 2 +- builtin/rm.c | 2 +- cache.h | 2 +- read-cache.c | 5 +++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/builtin/add.c

[PATCH v2 32/46] Convert {read,fill}_directory to take struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c | 4 +++- builtin/clean.c| 2 +- builtin/grep.c | 2 +- builtin/ls-files.c | 2 +- dir.c | 16 +++- dir.h | 4 ++-- wt-status.c| 2 +- 7 files changed, 20

[PATCH v2 27/46] Convert run_add_interactive to use struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
This passes the pathspec, more or less unmodified, to git-add--interactive. The command itself does not process pathspec. It simply passes the pathspec to other builtin commands. So if all those commands support pathspec, we're good. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com ---

[PATCH v2 24/46] reset: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/reset.c | 26 -- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index afa6e02..313b296 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -174,7 +174,10

[PATCH v2 26/46] Convert read_cache_preload() to take struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 2 +- builtin/commit.c | 4 ++-- builtin/diff-files.c | 2 +- builtin/diff-index.c | 2 +- builtin/diff.c | 4 ++-- cache.h | 2 +- preload-index.c | 20 +++- 7

[PATCH v2 23/46] add: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c | 103 +- pathspec.c| 43 2 files changed, 45 insertions(+), 101 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index

[PATCH v2 29/46] checkout: convert read_tree_some to take struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 9 +++-- tree.c | 4 ++-- tree.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 5d31767..c2f3571 100644 ---

[PATCH v2 28/46] Convert unmerge_cache to take struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- rerere.c | 2 +- resolve-undo.c | 4 ++-- resolve-undo.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rerere.c b/rerere.c index 27afbfe..4105bca 100644 --- a/rerere.c +++ b/rerere.c @@ -668,7 +668,7 @@ int

[PATCH v2 25/46] line-log: convert to use parse_pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- line-log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/line-log.c b/line-log.c index 4bbb09b..843a334 100644 --- a/line-log.c +++ b/line-log.c @@ -747,7 +747,7 @@ void line_log_init(struct rev_info *rev, const char

[PATCH v2 33/46] Convert add_files_to_cache to take struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c| 11 +++ builtin/commit.c | 2 +- cache.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index 34c9358..a47aeb4 100644 --- a/builtin/add.c +++

[PATCH v2 34/46] Convert common_prefix() to use struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
The code now takes advantage of nowildcard_len field. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/commit.c | 2 +- builtin/ls-files.c | 2 +- dir.c | 31 +++ dir.h | 2 +- 4 files changed, 18 insertions(+), 19

[PATCH v2 30/46] Convert report_path_error to take struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 2 +- builtin/commit.c | 14 ++ builtin/ls-files.c | 19 +++ cache.h| 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/builtin/checkout.c

[PATCH v2 37/46] Remove match_pathspec() in favor of match_pathspec_depth()

2013-07-14 Thread Nguyễn Thái Ngọc Duy
match_pathspec_depth was created to replace match_pathspec (see 61cf282 (pathspec: add match_pathspec_depth() - 2010-12-15). It took more than two years, but the replacement finally happens :-) Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c | 30 +++---

[PATCH v2 39/46] Rename field raw to _raw in struct pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
This patch is essentially no-op. It helps catching new use of this field though. This field is introduced as an intermediate step for the pathspec conversion and will be removed eventually. At this stage no more access sites should be introduced. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v2 40/46] parse_pathspec: make sure the prefix part is wildcard-free

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Prepending prefix to pathspec is a trick to workaround the fact that commands can be executed in a subdirectory, but all git commands run at worktree's root. The prefix part should always be treated as literal string. Make it so. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache.h

[PATCH v2 35/46] Remove diff_tree_{setup,release}_paths

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/blame.c | 12 ++-- builtin/reset.c | 9 + combine-diff.c | 4 ++-- diff.h | 2 -- notes-merge.c | 4 ++-- revision.c | 5 +++-- tree-diff.c | 18 -- 7 files changed, 22

[PATCH v2 41/46] parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN

2013-07-14 Thread Nguyễn Thái Ngọc Duy
The prefix length is passed from one command to another via the new magic 'prefix'. The magic is for parse_pathspec's internal use only, not visible to parse_pathspec's callers. Prefix length is not preserved across commands when --literal-pathspecs is specified (no magic is allowed, including

[PATCH v2 42/46] Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- dir.c | 8 pathspec.c | 8 ++-- pathspec.h | 2 -- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dir.c b/dir.c index bf22498..79465e7 100644 --- a/dir.c +++ b/dir.c @@ -1473,14 +1473,6 @@ int

[PATCH v2 38/46] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Put a checkpoint to guard unsupported pathspec features in future. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- tree-diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tree-diff.c b/tree-diff.c index e1145c6..21a50d8 100644 --- a/tree-diff.c +++

[PATCH v2 43/46] pathspec: support :(literal) syntax for noglob pathspec

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/glossary-content.txt | 20 builtin/add.c | 2 +- builtin/diff.c | 2 +- dir.c | 15 --- pathspec.c

[PATCH v2 36/46] Remove init_pathspec() in favor of parse_pathspec()

2013-07-14 Thread Nguyễn Thái Ngọc Duy
While at there, move free_pathspec() to pathspec.c Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/blame.c| 8 +--- builtin/log.c | 2 +- builtin/ls-files.c | 11 +-- diff-lib.c | 2 +- dir.c | 58

[PATCH v2 44/46] pathspec: make --literal-pathspecs disable pathspec magic

2013-07-14 Thread Nguyễn Thái Ngọc Duy
--literal-pathspecs and its equivalent environment variable are probably used for scripting. In that setting, pathspec magic may be unwanted. Disabling globbing in individual pathspec can be done via :(literal) magic. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com ---

[PATCH v2 45/46] pathspec: support :(glob) syntax

2013-07-14 Thread Nguyễn Thái Ngọc Duy
:(glob)path differs from plain pathspec that it uses wildmatch with WM_PATHNAME while the other uses fnmatch without FNM_PATHNAME. The difference lies in how '*' (and '**') is processed. With the introduction of :(glob) and :(literal) and their global options --[no]glob-pathspecs, the user can:

[PATCH v2 46/46] parse_pathspec: accept :(icase)path syntax

2013-07-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/git.txt | 8 Documentation/glossary-content.txt | 3 ++ builtin/add.c | 6 ++- builtin/ls-tree.c | 2 +- cache.h| 1 + dir.c

Re: [PATCH v2 46/46] parse_pathspec: accept :(icase)path syntax

2013-07-14 Thread Eric Sunshine
On Sun, Jul 14, 2013 at 4:36 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/Documentation/git.txt b/Documentation/git.txt index 3571a1b..546eea4 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -879,6 +883,10 @@ GIT_NOGLOB_PATHSPECS:: Setting this

[PATCH] .mailmap: Combine more (email, name) to individual persons

2013-07-14 Thread Stefan Beller
I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. It's mostly email mappings again. However we also have Nick Stokoe, who contributed as Nick Woolley. He changed his name, but kept the email. Signed-off-by: Stefan

[PATCH] more mailmap entries

2013-07-14 Thread Stefan Beller
This patch goes on top of branch sb/mailmap-updates Stefan Beller (1): .mailmap: Combine more (email, name) to individual persons .mailmap | 42 +++--- 1 file changed, 35 insertions(+), 7 deletions(-) -- 1.8.3.2.804.g0da7a53.dirty -- To unsubscribe from

Re: [PATCH v2 1/2] send-email: squelch warning from Net::SMTP::SSL

2013-07-14 Thread Ramkumar Ramachandra
Torsten Bögershausen wrote: /usr/bin/perl -MIO::Socket::SSL -e 'print $IO::Socket::SSL::VERSION\n;' 1.22 This is ancient! (I have 1.84). Is it not possible to do an ssl-verify-peer in older versions (is it exported as something else)? The older versions don't display the warning anyway, and

[PATCH] commit: Fix a memory leak in determine_author_info

2013-07-14 Thread Stefan Beller
The date variable is assigned new memory via xmemdupz and 2 lines later it is assigned new memory again via xmalloc, but the first assignment is never freed nor used. --- builtin/commit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index 790e5ab..00da83c

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread John Keeping
On Sat, Jul 13, 2013 at 01:08:09PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: If --lockref automatically implies --allow-no-ff (the design in the reposted patch), you cannot express that combination. But once you use --lockref in such a situation , for the push

[PATCH] fixup! pull: require choice between rebase/merge on non-fast-forward pull

2013-07-14 Thread John Keeping
--- On Fri, Jun 28, 2013 at 03:41:34PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: I don't think git pull remote branch falls into the same category as plain git pull so I'm not convinced that defaulting to merge there is unreasonable. The original message about

Re: [PATCH] test-lib.sh - cygwin does not have usable FIFOs

2013-07-14 Thread Mark Levedahl
On 07/13/2013 08:57 PM, Jonathan Nieder wrote: I'm not sure I follow. Are you saying Windows users would never want to access Subversion repositories? Thanks, Jonathan Quite the contrary. SVN and git both work on Windows without having POSIX FIFOs - Windows does have FIFOS, but the semantics

[PATCH] Cygwin has trustable filemode

2013-07-14 Thread Mark Levedahl
The supported Cygwin distribution on supported Windows versions provides complete support for POSIX filemodes, so enable this by default. git as distributed by the Cygwin project is configured this way. This fixes one testsuite failure: t3300 test 17 (diff-index -M -p with mode change quotes

Re: [RFC/PATCH v2 1/1] cygwin: Add fast_lstat() and fast_fstat() functions

2013-07-14 Thread Mark Levedahl
On 07/10/2013 04:23 PM, Ramsay Jones wrote: Commit adbc0b6b (cygwin: Use native Win32 API for stat, 30-09-2008) added a Win32 specific implementation of the stat functions. In order to handle absolute paths, cygwin mount points and symbolic links, this implementation may fall back on the

[PATCH 0/6] Update to janitorial work on hook templates

2013-07-14 Thread Richard Hartmann
Dear all, I worked Jeff's and Junio's feedback into this patch series, referencing the old commits. As stated earlier, you are welcome to drop 1/6, but 2/6 depends on it. Your choice, both is fine by me. Thanks, Richard Richard Hartmann (6): templates: Use heredoc in pre-commit hook

[PATCH 4/6] Documentation: Update manpage for pre-commit hook

2013-07-14 Thread Richard Hartmann
Verbatim copy of 4b8234b2693af634a77ea059331d1658e070f6d7 in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann richih.mailingl...@gmail.com --- Documentation/githooks.txt |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/githooks.txt

[PATCH 6/6] template: Fix comment indentation in pre-rebase hook

2013-07-14 Thread Richard Hartmann
The other hooks use two whitespace for indentation instead of tabs to signify code in the example/echo output. Follow the same layout in templates/hooks--pre-rebase.sample Based on d153a68bebfabc1db5241d02ee75fa5cb4538ab0 in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann

[PATCH 1/6] templates: Use heredoc in pre-commit hook

2013-07-14 Thread Richard Hartmann
Spawning a new subprocess for every line printed is inefficient. Use heredoc, instead. Based on 98770971aef8d1cbc78876d9023d10aa25df0526 in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann richih.mailingl...@gmail.com --- templates/hooks--pre-commit.sample | 25

[PATCH 2/6] templates: Reformat pre-commit hook's message

2013-07-14 Thread Richard Hartmann
Now that we're using heredoc, the message can span the full 80 chars. Verbatim copy of 634709b489bb3db79f59127fd6bf79c5fd9b5ddf in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann richih.mailingl...@gmail.com --- templates/hooks--pre-commit.sample |6 ++ 1 file

[PATCH 3/6] templates: Fix spelling in pre-commit hook

2013-07-14 Thread Richard Hartmann
Based on 0b9b01276553de8097442c3c996b7a49367dd234 in original patch series. Signed-off-by: Richard Hartmann richih.mailingl...@gmail.com --- templates/hooks--pre-commit.sample |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/hooks--pre-commit.sample

[PATCH 5/6] templates: Fix ASCII art in pre-rebase hook

2013-07-14 Thread Richard Hartmann
The example assumes 8-char wide tabs and breaks for people with 4-char wide tabs. Convert all of those tabs to whitespace, instead. Verbatim copy of 11edd8a05778700382e6a21cfc0a6b5b72eff852 in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann richih.mailingl...@gmail.com ---

Re: [PATCH v2 1/2] send-email: squelch warning from Net::SMTP::SSL

2013-07-14 Thread brian m. carlson
On Sun, Jul 14, 2013 at 07:19:10PM +0530, Ramkumar Ramachandra wrote: Torsten Bögershausen wrote: /usr/bin/perl -MIO::Socket::SSL -e 'print $IO::Socket::SSL::VERSION\n;' 1.22 This is ancient! (I have 1.84). Is it not possible to do an ssl-verify-peer in older versions (is it exported as

Re: [PATCH 1/6] templates: Use heredoc in pre-commit hook

2013-07-14 Thread Jonathan Nieder
Hi, Richard Hartmann wrote: Spawning a new subprocess for every line printed is inefficient. Use heredoc, instead. I think this makes sense as a code clarity, simplicity, and internationalizability improvement, but don't like the precedent of eliminating 'echo' for the sake of fork removal

Re: [PATCH 2/6] templates: Reformat pre-commit hook's message

2013-07-14 Thread Jonathan Nieder
Richard Hartmann wrote: Now that we're using heredoc, the message can span the full 80 chars. The output is going to a console and not an email, so makes sense. :) Verbatim copy of 634709b489bb3db79f59127fd6bf79c5fd9b5ddf in original patch series from 2013-06-10. As in patch 1, please drop

Re: [PATCH 4/6] Documentation: Update manpage for pre-commit hook

2013-07-14 Thread Jonathan Nieder
Richard Hartmann wrote: --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -80,7 +80,8 @@ causes the 'git commit' to abort. The default 'pre-commit' hook, when enabled, catches introduction of lines with trailing whitespaces and aborts the commit when -such a line is

Re: [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook

2013-07-14 Thread Jonathan Nieder
Richard Hartmann wrote: The example assumes 8-char wide tabs and breaks for people with 4-char wide tabs. Convert all of those tabs to whitespace, instead. Makes sense --- we cannot assume much about the end-user's editor setup used to look at sample hooks. Thanks. -- To unsubscribe from this

Re: [PATCH] git-clone.txt: remove the restriction on pushing from a shallow clone

2013-07-14 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Sun, Jul 14, 2013 at 4:25 AM, Jonathan Nieder jrnie...@gmail.com wrote: Hi, Nguyễn Thái Ngọc Duy wrote: Since 52fed6e (receive-pack: check connectivity before concluding git push - 2011-09-02), receive-pack is prepared to deal with broken push, a

Re: [PATCH 6/6] template: Fix comment indentation in pre-rebase hook

2013-07-14 Thread Jonathan Nieder
Richard Hartmann wrote: The other hooks use two whitespace for indentation instead of tabs to signify code in the example/echo output. Follow the same layout in templates/hooks--pre-rebase.sample I don't understand the point of this one. Is it just consistency for the sake of consistency?

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: All you have been saying is that you find your git push --lockref there topic is more useful than my git push --lockref there +topic You are trading crystal clear semantics to save users ONE character to type. IMO, it's a bad deal. Think how

Re: [PATCH 1/6] templates: Use heredoc in pre-commit hook

2013-07-14 Thread Junio C Hamano
Richard Hartmann richih.mailingl...@gmail.com writes: Spawning a new subprocess for every line printed is inefficient. This is not a valid justification at all, is it? Shells on modern distros and platforms have echo built-in, so this patch replaces series of writes internal to the shell

Re: [PATCH 1/6] templates: Use heredoc in pre-commit hook

2013-07-14 Thread Richard Hartmann
On Sun, Jul 14, 2013 at 9:20 PM, Junio C Hamano gits...@pobox.com wrote: Shells on modern distros and platforms have echo built-in, so this patch replaces series of writes internal to the shell with a fork to cat with heredoc (which often is implemented with a temporary file). True; fwiw, I

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Johannes Sixt
Am 14.07.2013 21:17, schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: I actually think that by implying allow-no-ff in --lockref, you are hurting users who have configured a push refspec without a + prefix: They suddenly do not get the push denied when it is not a fast-forward

Re: [PATCH 1/6] templates: Use heredoc in pre-commit hook

2013-07-14 Thread Jonathan Nieder
Richard Hartmann wrote: fwiw, I replaced my one single echo with heredoc as you suggested I do that. I don't mind undoing that, or I can drop it from this series altogether. Guidance would be appreciated. :) Thanks for your work, and no problem. Both Junio's and my responses were

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Jonathan Nieder
Johannes Sixt wrote: Sorry, IMO, this goes into a totally wrong direction, in particular, I think that this is going to close to door to make --lockref the default some day in a way that helps everyone. Would a '*' that acts like --lockref on a per ref basis address your concerns? I realize

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Jonathan Nieder
Jonathan Nieder wrote: Johannes Sixt wrote: Sorry, IMO, this goes into a totally wrong direction, in particular, I think that this is going to close to door to make --lockref the default some day in a way that helps everyone. Would a '*' that acts like --lockref on a per ref basis address

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Johannes Sixt
Am 14.07.2013 22:34, schrieb Jonathan Nieder: Johannes Sixt wrote: Sorry, IMO, this goes into a totally wrong direction, in particular, I think that this is going to close to door to make --lockref the default some day in a way that helps everyone. Would a '*' that acts like --lockref on

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Jonathan Nieder
Johannes Sixt wrote: Am 14.07.2013 22:34, schrieb Jonathan Nieder: Would a '*' that acts like --lockref on a per ref basis address your concerns? No, because I think that new syntax is not necessary. But admittedly, I haven't spent any time to think about push.default modes other than

[PATCH 1/4] daemon.c:handle: Remove unneeded check for null pointer.

2013-07-14 Thread Stefan Beller
addr doesn't need to be checked at that line as it it already accessed 7 lines before in the if (addr-sa_family). Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- daemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon.c b/daemon.c index 6aeddcb..5e48c1e

[PATCH 3/4] diff-no-index: Remove unused variable.

2013-07-14 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- diff-no-index.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index e66fdf3..842add4 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -181,19 +181,18 @@ static int

[PATCH 2/4] commit: Fix a memory leak in determine_author_info

2013-07-14 Thread Stefan Beller
The date variable is assigned new memory via xmemdupz and 2 lines later it is assigned new memory again via xmalloc, but the first assignment is never freed nor used. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/commit.c | 1 - 1 file changed, 1 deletion(-) diff --git

[PATCH 4/4] diff.c: Do not initialize a variable, which gets reassigned anyway.

2013-07-14 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- diff.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/diff.c b/diff.c index e53ddad..24382d7 100644 --- a/diff.c +++ b/diff.c @@ -1677,21 +1677,19 @@ static void show_stats(struct diffstat_t *data, struct

Re: [PATCH 1/4] daemon.c:handle: Remove unneeded check for null pointer.

2013-07-14 Thread Jonathan Nieder
Hi, Stefan Beller wrote: addr doesn't need to be checked at that line as it it already accessed 7 lines before in the if (addr-sa_family). Good catch. This asymmetry has been present since the lines were first introduced (all guarded by if (addr)) in v1.4.1-rc1~3^2~4 (Log peer address when

Re: [PATCH 2/4] commit: Fix a memory leak in determine_author_info

2013-07-14 Thread Jonathan Nieder
Stefan Beller wrote: Signed-off-by: Stefan Beller stefanbel...@googlemail.com Thanks. That was quick. :) Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH v2 1/2] send-email: squelch warning from Net::SMTP::SSL

2013-07-14 Thread Ramkumar Ramachandra
brian m. carlson wrote: I didn't stick the require in the eval because git-send-email will fail in this case anyway if you don't have it, since Net::SMTP::SSL requires it. Let me know if you want a patch for this on top of the existing two in this series and I'll provide one. Yeah, that'd be

Re: [PATCH 3/4] diff-no-index: Remove unused variable.

2013-07-14 Thread Jonathan Nieder
Stefan Beller wrote: [Subject: diff-no-index: Remove unused variable.] [...] --- a/diff-no-index.c +++ b/diff-no-index.c [...] - else if (!strcmp(argv[i], -q)) { + else if (!strcmp(argv[i], -q)) - options |= DIFF_SILENT_ON_REMOVED;

Re: [PATCH 4/4] diff.c: Do not initialize a variable, which gets reassigned anyway.

2013-07-14 Thread Jonathan Nieder
Stefan Beller wrote: Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- diff.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) [...] --- a/diff.c +++ b/diff.c @@ -1677,21 +1677,19 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)

Re: [PATCH] gitweb: Ensure OPML text fits inside its box.

2013-07-14 Thread Jonathan Nieder
Tony Finch wrote: The rss_logo CSS style has a fixed width which is too narrow for the string OPML. Replace the fixed width with horizontal padding so the text fits with nice margins. Sounds sensible. Can we have your sign-off? (Likewise for the next patch.) Thanks, Jonathan -- To

Re: [PATCH] git-clone.txt: remove the restriction on pushing from a shallow clone

2013-07-14 Thread Duy Nguyen
On Mon, Jul 15, 2013 at 1:52 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: On Sun, Jul 14, 2013 at 4:25 AM, Jonathan Nieder jrnie...@gmail.com wrote: Hi, Nguyễn Thái Ngọc Duy wrote: Since 52fed6e (receive-pack: check connectivity before concluding git

Re: [PATCH] mailmap: Testing the single letter name case.

2013-07-14 Thread Eric Sunshine
On Sat, Jul 13, 2013 at 4:20 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller stefanbel...@googlemail.com writes: Indeed the patch tests for both bugs unintentionally. I was puzzled because I do not think that is what is happening with the posted patch. The off-by-one fix seems to

Re: [PATCH v2 1/2] send-email: squelch warning from Net::SMTP::SSL

2013-07-14 Thread Torsten Bögershausen
On 2013-07-14 19.03, brian m. carlson wrote: On Sun, Jul 14, 2013 at 07:19:10PM +0530, Ramkumar Ramachandra wrote: Torsten Bögershausen wrote: /usr/bin/perl -MIO::Socket::SSL -e 'print $IO::Socket::SSL::VERSION\n;' 1.22 This is ancient! (I have 1.84). Is it not possible to do an

Re: [PATCH 1/6] templates: Use heredoc in pre-commit hook

2013-07-14 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Based on 98770971aef8d1cbc78876d9023d10aa25df0526 in original patch series from 2013-06-10. Please don't include this. The audience for the commit message doesn't have that commit to compare to. If you want to preserve the original date, the way

Re: [PATCH 1/7] cat-file: disable object/refname ambiguity check for batch mode

2013-07-14 Thread Junio C Hamano
Jeff King p...@peff.net writes: To cat-file we could add an option like --sha1-only or --literal or --no-dwim (... better names are failing me) which would skip *all* dwimming of 40-character strings. It would also assume that any shorter strings are abbreviated SHA-1s and fail if they are

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: Am 14.07.2013 21:17, schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: I actually think that by implying allow-no-ff in --lockref, you are hurting users who have configured a push refspec without a + prefix: They suddenly do not get the push

Re: [PATCH v3] config: add support for http.url.* settings

2013-07-14 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: On Jul 12, 2013, at 13:58, Aaron Schrab wrote: ... This should guarantee a match in the scenario Aaron proposes above and still has pretty much the same easy explanation to the user. Shall I go ahead and add that to the next patch version? Or

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: (4) gitk @{u}@{1}..@{u}; # Is the change good? (5a) git pull --rebase; git push; # Yes, put my change on top of it (5b) git push --force; # No, my change is better! So far so good. But what if yet another change is made upstream

  1   2   >