Re: [PATCH v4 6/6] clean: teach clean -d to skip dirs containing ignored files

2017-05-21 Thread Junio C Hamano
Samuel Lijin writes: >> By the way, instead of putting NULL, it may be easier to follow if >> you used two pointers, src and dst, into dir.entries[], just like >> you did in your latest version of [PATCH 4/6]. That way, you do not >> have to change anything in the later loop that walks over elem

What's cooking in git.git (May 2017, #06; Mon, 22)

2017-05-21 Thread Junio C Hamano
What's cooking in git.git (May 2017, #06; Mon, 22) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in

Re: [PATCH v4 6/6] clean: teach clean -d to skip dirs containing ignored files

2017-05-21 Thread Samuel Lijin
On Mon, May 22, 2017 at 12:48 AM, Junio C Hamano wrote: > Samuel Lijin writes: > >> + for (j = i = 0; i < dir.nr;) { >> + for (; >> + j < dir.ignored_nr && >> +0 <= cmp_dir_entry(&dir.entries[i], &dir.ignored[j]); >> + j++); >>

Re: [PATCH v4 6/6] clean: teach clean -d to skip dirs containing ignored files

2017-05-21 Thread Junio C Hamano
Samuel Lijin writes: > + for (j = i = 0; i < dir.nr;) { > + for (; > + j < dir.ignored_nr && > +0 <= cmp_dir_entry(&dir.entries[i], &dir.ignored[j]); > + j++); > + > + if ((j < dir.ignored_nr) && > +

Re: [PATCH v5] send-email: --batch-size to work around some SMTP server limit

2017-05-21 Thread Zhaoxiangqiang
Junio C Hamano 于 2017 年 5 月 22 日 星期一 写道: > I think this is almost perfect. > > I'd propose squashing the patch below to > > - Add cross reference between config and option > > - Spell configuration variables in camelCase to mimic other >sendemail.* variables > > - Spell SMTP in all cap

Re: [PATCH v4 4/6] dir: hide untracked contents of untracked dirs

2017-05-21 Thread Junio C Hamano
Samuel Lijin writes: > + > + /* if DIR_SHOW_IGNORED_TOO, read_directory_recursive() will also pick > + * up untracked contents of untracked dirs; by default we discard these, > + * but given DIR_KEEP_UNTRACKED_CONTENTS we do not > + */ No need to resend only to fix this, as I'

Re: [PATCH v2 2/2] sha1dc: optionally use sha1collisiondetection as a submodule

2017-05-21 Thread Junio C Hamano
Junio C Hamano writes: > But when somebody (like me?) feels strongly enough, such a change > can always come on top of this patch, so let's have this > manual-configuration-only version as our first step. Just so that I have something I can come back to, here it is with a log message. -- >8 --

Re: [PATCH] usage: add NORETURN to BUG() function definitions

2017-05-21 Thread Junio C Hamano
Junio C Hamano writes: > Ramsay Jones writes: > >> So, I don't know. Wait let me try your specific version: >> >> $ ~/sparse/sparse --version >> v0.5.0-207-g14964df >> $ ~/sparse/sparse usage.c >> usage.c:220:6: error: symbol 'BUG_fl' redeclared with different type >> (originally declared at gi

Re: [PATCH] usage: add NORETURN to BUG() function definitions

2017-05-21 Thread Junio C Hamano
Ramsay Jones writes: > So, I don't know. Wait let me try your specific version: > > $ ~/sparse/sparse --version > v0.5.0-207-g14964df > $ ~/sparse/sparse usage.c > usage.c:220:6: error: symbol 'BUG_fl' redeclared with different type > (originally declared at git-compat-util.h:1074) - different m

Re: [PATCH v5] send-email: --batch-size to work around some SMTP server limit

2017-05-21 Thread Junio C Hamano
I think this is almost perfect. I'd propose squashing the patch below to - Add cross reference between config and option - Spell configuration variables in camelCase to mimic other sendemail.* variables - Spell SMTP in all caps to mimic other parts of the manual - Suggest use of credent

Re: [PATCH] usage: add NORETURN to BUG() function definitions

2017-05-21 Thread Ramsay Jones
On 22/05/17 02:43, Junio C Hamano wrote: > Ramsay Jones writes: > >> Commit d8193743e0 ("usage.c: add BUG() function", 12-05-2017) added the >> BUG() functions and macros as a replacement for calls to die("BUG: .."). >> The use of NORETURN on the declarations (in git-compat-util.h) and the >> l

Re: [PATCH] usage: add NORETURN to BUG() function definitions

2017-05-21 Thread Junio C Hamano
Ramsay Jones writes: > Commit d8193743e0 ("usage.c: add BUG() function", 12-05-2017) added the > BUG() functions and macros as a replacement for calls to die("BUG: .."). > The use of NORETURN on the declarations (in git-compat-util.h) and the > lack of NORETURN on the function definitions, howeve

Re: [PATCH v2 2/2] sha1dc: optionally use sha1collisiondetection as a submodule

2017-05-21 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > +# Define DC_SHA1_SUBMODULE in addition to DC_SHA1 to use the > +# sha1collisiondetection shipped as a submodule instead of the > +# non-submodule copy in sha1dc/. This is an experimental option used > +# by the git project to migrate to using sha1collisiondetec

Re: [PATCH] ref-filter: treat CRLF as same as LF in find_subpos

2017-05-21 Thread Junio C Hamano
DOAN Tran Cong Danh writes: > Starting from commit 949af06 (branch: use ref-filter printing APIs, > 2017-01-10), > `git branch -v` doesn't treat CRLF as line separator anymore. A seemingly good problem identification (but not quite; see below) ... > > Quote from git mailing-list: > >> Here is

Re: [PATCH v4 5/6] dir: expose cmp_name() and check_contains()

2017-05-21 Thread Junio C Hamano
Samuel Lijin writes: > We want to use cmp_name() and check_contains() (which both compare > `struct dir_entry`s, the former in terms of the sort order, the latter > in terms of whether one lexically contains another) outside of dir.c, > so we have to (1) change their linkage and (2) rename them a

Re: [PATCH v3 05/30] log: make --regexp-ignore-case work with --perl-regexp

2017-05-21 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> Looks good. >> >> I however wonder if it is a better approach in the longer term to >> treat the .ignore_case field just like .extended_regexp_option >> field, i.e. not committing immediately to .regflags but commit it >> after config and command line parsing is

[PATCH] usage: add NORETURN to BUG() function definitions

2017-05-21 Thread Ramsay Jones
Commit d8193743e0 ("usage.c: add BUG() function", 12-05-2017) added the BUG() functions and macros as a replacement for calls to die("BUG: .."). The use of NORETURN on the declarations (in git-compat-util.h) and the lack of NORETURN on the function definitions, however, leads sparse to complain th

Re: [PATCH v3 4/4] convert: add "status=delayed" to filter process protocol

2017-05-21 Thread Lars Schneider
> On 19 Apr 2017, at 20:55, Torsten Bögershausen wrote: > > >>> (Back to the roots) >>> Which criteria do you have in mind: When should a filter process the blob >>> and return it immediately, and when would it respond "delayed" ? >> >> See above: it's up to the filter. In case of Git LFS: del

Re: [WIP/RFC 00/23] repository object

2017-05-21 Thread brian m. carlson
On Thu, May 18, 2017 at 04:21:11PM -0700, Brandon Williams wrote: > This is still very much in a WIP state, though it does pass all tests. What > I'm hoping for here is to get a discussion started about the feasibility of a > change like this and hopefully to get the ball rolling. Is this a direc

[PATCH] ref-filter: treat CRLF as same as LF in find_subpos

2017-05-21 Thread DOAN Tran Cong Danh
Starting from commit 949af06 (branch: use ref-filter printing APIs, 2017-01-10), `git branch -v` doesn't treat CRLF as line separator anymore. Quote from git mailing-list: > Here is a recipe to reproduce the error: > >git init >git commit --allow-empty -m initial >git branch crlf $(pr

[PATCH] ref-filter: treat CRLF as same as LF in find_subpos

2017-05-21 Thread DOAN Tran Cong Danh
Starting from commit 949af06 (branch: use ref-filter printing APIs, 2017-01-10), `git branch -v` doesn't treat CRLF as line separator anymore. Quote from git mailing-list: > Here is a recipe to reproduce the error: > >git init >git commit --allow-empty -m initial >git branch crlf $(pr

[PATCH v5] send-email: --batch-size to work around some SMTP server limit

2017-05-21 Thread xiaoqiang zhao
Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session(connection) and this will lead to a faliure when sending many messages. Teach send-email to disconnect after sending a number of messages (configurable via the --batch-size= option), wait for a few seconds (confi

[GSoC][PATCH v4 2/2] submodule: port subcommand foreach from shell to C

2017-05-21 Thread Prathamesh Chavan
This aims to make git-submodule foreach a builtin. This is the very first step taken in this direction. Hence, 'foreach' is ported to submodule--helper, and submodule--helper is called from git-submodule.sh. The code is split up to have one function to obtain all the list of submodules. This functi

[GSoC][PATCH v4 1/2] t7407: test "submodule foreach --recursive" from subdirectory added

2017-05-21 Thread Prathamesh Chavan
Additional test cases added to the submodule-foreach test suite to check the submodule foreach --recursive behavior from a subdirectory as this was missing from the test suite. Mentored-by: Christian Couder Mentored-by: Stefan Beller Signed-off-by: Prathamesh Chavan --- It was observed that aft

[GSoC][PATCH v1 2/2] submodule: port submodule subcommand status

2017-05-21 Thread Prathamesh Chavan
This aims to make git-submodule status a builtin. 'status' is ported to submodule--helper, and submodule--helper is called from git-submodule.sh. For the purpose of porting cmd_status, the code is split up such that one function obtains all the list of submodules, acting as the front-end of git-su

[GSoC][PATCH v1 1/2] submodule: port set_name_rev from shell to C

2017-05-21 Thread Prathamesh Chavan
Since later on we want to port submodule subcommand status, and since set_name_rev is part of cmd_status, hence this function is ported. It has been ported to function set_name_rev in C, which calls get_name_rev to get the revname, and after formatting it, set_name_prints it. And hence in this way,

URGENT

2017-05-21 Thread KatieHiggins
Ahoj drahý, Volám sa Katie Higginsová, zo Spojených štátov amerických. som Záujem o vás, predstavím svoje vlastné lepšie, akonáhle dostanem Vaša pošta dúfa, že počujete od vás. Vďaka a bozkám. Katie Higginsová.

Re: [WIP/RFC 00/23] repository object

2017-05-21 Thread Jacob Keller
On Thu, May 18, 2017 at 4:21 PM, Brandon Williams wrote: > This is still very much in a WIP state, though it does pass all tests. What > I'm hoping for here is to get a discussion started about the feasibility of a > change like this and hopefully to get the ball rolling. Is this a direction >