Ich werde auf deine Antwort warten.

2016-05-24 Thread Chan Chak
Hallo, Mein Name ist Chan Chak ein Bankmanager mit einer Investmentbank , ich ein Geschäft zum gegenseitigen Nutzen haben, die Übertragung von großen Geldsumme. Erhalten Sie für weitere Details zu mir zurück, wenn Sie interessiert sind. CHAN CHAK (chanchak...@gmail.com) -- To unsubscribe from t

[PATCH v8 2/3] bisect: rewrite `check_term_format` shell function in C

2016-05-24 Thread Pranit Bauva
Reimplement the `check_term_format` shell function in C and add a `--check-term-format` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--check-term-format` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As more functions

[PATCH v8 0/3] bisect--helper: check-term-format() & write_terms()

2016-05-24 Thread Pranit Bauva
Here is the link to v7[1]. This has a few modifications. Changes wrt v7 as suggested by Eric are: * Include the name of the file in the error message which couldn't be opened. * Use error_errno() with which we can make the error message more valuable. Pranit Bauva (3): bisect--helper: use O

[PATCH v8 1/3] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-24 Thread Pranit Bauva
`--next-all` is meant to be used as a subcommand to support multiple "operation mode" though the current implementation does not contain any other subcommand along side with `--next-all` but further commits will include some more subcommands. Helped-by: Johannes Schindelin Mentored-by: Lars Schne

[PATCH v8 3/3] bisect--helper: `write_terms` shell function in C

2016-05-24 Thread Pranit Bauva
Reimplement the `write_terms` shell function in C and add a `write-terms` subcommand to `git bisect--helper` to call it from git-bisect.sh . Also remove the subcommand `--check-term-format` as it can now be called from inside the function write_terms() C implementation. Also `|| exit` is added whe

Re: [PATCH v8 3/3] bisect--helper: `write_terms` shell function in C

2016-05-24 Thread Christian Couder
On Tue, May 24, 2016 at 9:21 AM, Pranit Bauva wrote: > Reimplement the `write_terms` shell function in C and add a `write-terms` > subcommand to `git bisect--helper` to call it from git-bisect.sh . Also > remove the subcommand `--check-term-format` as it can now be called from > inside the functio

[PATCH v3 00/49] libify apply and use lib in am, part 1

2016-05-24 Thread Christian Couder
Goal This is a patch series about libifying `git apply` functionality, and using this libified functionality in `git am`, so that no 'git apply' process is spawn anymore. This makes `git am` significantly faster, so `git rebase`, when it uses the am backend, is also significantly faster. Pre

[PATCH v3 02/49] builtin/apply: avoid parameter shadowing 'p_value' global

2016-05-24 Thread Christian Couder
Let's just rename the global 'state_p_value' as it will become 'state->p_value' in a following patch. This also avoid errors when compiling with -Wshadow and makes it safer to later move global variables into a "state" struct. Helped-by: Nguyễn Thái Ngọc Duy Reviewed-by: Stefan Beller Signed-of

[PATCH v3 01/49] builtin/apply: make gitdiff_verify_name() return void

2016-05-24 Thread Christian Couder
As the value returned by gitdiff_verify_name() is put into the same variable that is passed as a parameter to this function, it is simpler to pass the address of the variable and have gitdiff_verify_name() change the variable itself. This also makes it possible to later have this function return -

[PATCH v3 08/49] builtin/apply: introduce 'struct apply_state' to start libifying

2016-05-24 Thread Christian Couder
Currently commands that want to use the apply functionality have to launch a "git apply" process which can be bad for performance. Let's start libifying the apply functionality and to do that we first need to get rid of the global variables in "builtin/apply.c". This patch introduces "struct appl

[PATCH v3 32/49] builtin/apply: move 'p_value' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'p_value' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 151 +--- 1 file ch

[PATCH v3 41/49] builtin/apply: move 'ws_ignore_action' into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'ws_ignore_action' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 37 - 1 file changed, 20 i

[PATCH v3 33/49] builtin/apply: move 'p_value_known' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'p_value_known' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) dif

[PATCH v3 13/49] builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'apply_in_reverse' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 50 +++--- 1 file

[PATCH v3 37/49] builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()

2016-05-24 Thread Christian Couder
A previous change has move the whitespace_option variable from cmd_apply into 'struct apply_state', so that we can now avoid passing it separately to set_default_whitespace_mode(). Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 9 - 1 file changed, 4 in

[PATCH v3 39/49] builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'applied_after_fixing_ws' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 10 +- 1 file changed, 5 insertions(+), 5 delet

[PATCH v3 12/49] builtin/apply: move 'check_index' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'check_index' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 66 - 1 fil

[PATCH v3 25/49] builtin/apply: move 'line_termination' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'line_termination' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 14 +- 1 file changed, 9 insertions(+), 5 deletion

[PATCH v3 15/49] builtin/apply: move 'apply_verbosely' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'apply_verbosely' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 26 +- 1 file changed, 13 insertions(+)

[PATCH v3 07/49] builtin/apply: move 'read_stdin' global into cmd_apply()

2016-05-24 Thread Christian Couder
The 'read_stdin' variable doesn't need to be static and global to the file. It can be local to cmd_apply(), so let's move it there. This will make it easier to libify the apply functionality. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 2 +- 1 file changed,

[PATCH v3 11/49] builtin/apply: move 'check' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'check' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff

[PATCH v3 45/49] builtin/apply: move 'symlink_changes' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'symlink_changes' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 50 -- 1 file c

[PATCH v3 43/49] builtin/apply: move 'state_linenr' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'state_linenr' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 71 + 1 fi

[PATCH v3 40/49] builtin/apply: move 'ws_error_action' into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'ws_error_action' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Signed-off-by: Christian Couder --- builtin/apply.c | 61 +++-- 1 file changed, 33 insertions

[PATCH v3 49/49] builtin/apply: move 'newfd' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'newfd' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Signed-off-by: Christian Couder --- builtin/apply.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/

[PATCH v3 47/49] builtin/apply: move applying patches into apply_all_patches()

2016-05-24 Thread Christian Couder
To libify the apply functionality we should provide a function to apply many patches. Let's move the code to do that into a new apply_all_patches() function. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 129 +++-

[PATCH v3 42/49] builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'max_change' and 'max_len' variables should not be static and global to the file. Let's move them into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 49 +---

[PATCH v3 38/49] builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'squelch_whitespace_errors' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 22 +++--- 1 file changed, 11 insert

[PATCH v3 44/49] builtin/apply: move 'fn_table' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'fn_table' variable should not be static and global to the file. Let's move it into 'struct apply_state'. As fn_table is cleared at the end of apply_patch(), it is not necessary to clear it in clear_apply_state(). Reviewed-by: Stefan Beller Signed-off-by: Ch

[PATCH v3 48/49] builtin/apply: move 'lock_file' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
We cannot have a 'struct lock_file' allocated on the stack, as lockfile.c keeps a linked list of all created lock_file structures. So let's make the 'lock_file' variable a pointer to a 'struct lock_file' As the same instance of this struct can be reused, let's add an argument to init_apply_state()

[PATCH v3 16/49] builtin/apply: move 'update_index' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'update_index' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 45 ++--- 1 file changed,

[PATCH v3 06/49] builtin/apply: move 'options' variable into cmd_apply()

2016-05-24 Thread Christian Couder
The 'options' variable doesn't need to be static and global to the file. It can be local to cmd_apply(), so let's move it there. This will make it easier to libify the apply functionality. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 2 +- 1 file changed, 1

[PATCH v3 14/49] builtin/apply: move 'apply_with_reject' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'apply_with_reject' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletio

[PATCH v3 26/49] builtin/apply: move 'fake_ancestor' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'fake_ancestor' variable should not be static and global to the file. Let's move it into 'struct apply_state'. By the way remove a comment about '--index-info' that was renamed '--build-fake-ancestor' in commit 26b28007689d27a921ea90e5a29fc8eb74b0d297 (apply:

[PATCH v3 18/49] builtin/apply: move 'cached' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'cached' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 35 +++ 1 file changed, 19 insertions(+)

[PATCH v3 17/49] builtin/apply: move 'allow_overlap' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'allow_overlap' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-)

[PATCH v3 21/49] builtin/apply: move 'summary' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'summary' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[PATCH v3 30/49] builtin/apply: move 'limit_by_name' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'limit_by_name' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 26 -- 1 file changed, 16 insertions(+),

[PATCH v3 27/49] builtin/apply: move 'p_context' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'p_context' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --gi

[PATCH v3 10/49] builtin/apply: move 'unidiff_zero' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'unidiff_zero' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 43 +-- 1 file changed, 25

[PATCH v3 23/49] builtin/apply: move 'no_add' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'no_add' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/

[PATCH v3 35/49] builtin/apply: move 'whitespace_error' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'whitespace_error' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 28 +++- 1 file changed, 15 insertions

[PATCH v3 31/49] builtin/apply: move 'has_include' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'has_include' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --g

[PATCH v3 46/49] builtin/apply: move 'state' check into check_apply_state()

2016-05-24 Thread Christian Couder
To libify the apply functionality we should provide a function to check that the values in a 'struct apply_state' instance are coherent. Let's move the code to do that into a new check_apply_state() function. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 52 ++

[PATCH v3 29/49] builtin/apply: move 'patch_input_file' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'patch_input_file' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 27 +-- 1 file changed, 17 insertions(

Re: [PATCH] builtin/commit.c: memoize git-path for COMMIT_EDITMSG

2016-05-24 Thread Matthieu Moy
Junio C Hamano writes: > Pranit Bauva writes: > >> static const char *use_message_buffer; >> -static const char commit_editmsg[] = "COMMIT_EDITMSG"; >> +static const char commit_editmsg_path[] = git_path_commit_editmsg(); > > The function defined with the macro looks like > > const char *

[PATCH v3 22/49] builtin/apply: move 'threeway' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'threeway' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) di

[PATCH v3 34/49] builtin/apply: move 'root' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'root' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 82 ++--- 1 file chang

[PATCH v3 36/49] builtin/apply: move 'whitespace_option' into 'struct apply_state'

2016-05-24 Thread Christian Couder
This will enable further refactoring, and it is more coherent and simpler if all the option_parse_*() functions are passed a 'struct apply_state' instance in opt->value. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 13 ++--- 1 file changed, 6 insertio

[PATCH v3 24/49] builtin/apply: move 'unsafe_paths' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'unsafe_paths' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff

[PATCH v3 20/49] builtin/apply: move 'numstat' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'numstat' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --gi

[PATCH v3 19/49] builtin/apply: move 'diffstat' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'diffstat' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff

[PATCH v3 28/49] builtin/apply: move 'apply' global into 'struct apply_state'

2016-05-24 Thread Christian Couder
To libify the apply functionality the 'apply' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 31 +-- 1 file changed, 17 insertions(+), 14

[PATCH v3 09/49] builtin/apply: move 'state' init into init_apply_state()

2016-05-24 Thread Christian Couder
When the apply functionality will be libified, the 'struct apply_state' will be used by different pieces of code. To properly initialize a 'struct apply_state', let's provide a nice and easy to use init_apply_state() function. Let's also provide clear_apply_state() to release memory used by 'stru

[PATCH v3 05/49] builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()

2016-05-24 Thread Christian Couder
The match_fragment() function is very big and contains a big special case algorithm that does line by line fuzzy matching. So let's extract this algorithm in a separate line_by_line_fuzzy_match() function. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 126

Re: [PATCH v2 48/94] builtin/apply: rename 'prefix_' parameter to 'prefix'

2016-05-24 Thread Christian Couder
On Fri, May 13, 2016 at 9:42 PM, Christian Couder wrote: > On Thu, May 12, 2016 at 9:56 PM, Junio C Hamano wrote: >> Christian Couder writes: >> >>> This is just a small cleanup. >> >> ... which may have been better happened at 09/94. > > Ok, I will squash it in 09/94. This has been done in the

[PATCH v3 03/49] builtin/apply: avoid parameter shadowing 'linenr' global

2016-05-24 Thread Christian Couder
Let's just rename the global 'state_linenr' as it will become 'state->linenr' in a following patch. This also avoid errors when compiling with -Wshadow and makes it safer to later move global variables into a "state" struct. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builti

[PATCH v3 04/49] builtin/apply: avoid local variable shadowing 'len' parameter

2016-05-24 Thread Christian Couder
This is just a cleanup to avoid errors when compiling with -Wshadow and to make it safer to later move global variables into a "state" struct. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions

Re: [PATCH v2 48/94] builtin/apply: rename 'prefix_' parameter to 'prefix'

2016-05-24 Thread Christian Couder
On Sat, May 14, 2016 at 8:27 PM, Junio C Hamano wrote: > Christian Couder writes: > >> On Thu, May 12, 2016 at 10:43 PM, Junio C Hamano wrote: >>> Junio C Hamano writes: >>> Up to this point, the conversion looks quite sensible, even though I think the organization of fields in apply_

[PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION

2016-05-24 Thread Ville Skyttä
When the shell is in "nounset" or "set -u" mode, referencing unset or null variables results in an error. Protect $ZSH_VERSION and $BASH_VERSION against that. Signed-off-by: Ville Skyttä --- contrib/completion/git-prompt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/

Re: [PATCH v3 00/49] libify apply and use lib in am, part 1

2016-05-24 Thread Christian Couder
On Tue, May 24, 2016 at 10:10 AM, Christian Couder wrote: > > I will send a diff between this version and the 50 first patches of v2 > soon as a reply to this email. Here is the diff: diff --git a/builtin/apply.c b/builtin/apply.c index ec55768..c1c5592 100644 --- a/builtin/apply.c +++ b/builtin

Re: [Opinion gathering] Git remote whitelist/blacklist

2016-05-24 Thread Francois Beutin
> > > On May 20, 2016 10:22 AM, Francois Beutin wrote: > > > We (Ensimag students) plan to implement the "remote whitelist/blacklist" > > > feature described in the SoC 2016 ideas, but first I would like to be > > > sure > > > we > > > agree on what exactly this feature would be, and that the commu

[BUG] can not escape sharps in git config file

2016-05-24 Thread Jean-Noël Avila
Hi everyone, I stumbled on this: config file: [filter "kicad_sch"] clean = sed -E 's/#(PWR|FLG)[0-9]+/#\1?/' smudge = cat Then in the shell: ± git add -u sed -E 's/: 1: sed -E 's/: Syntax error: Unterminated quoted string error: external filter sed -E 's/ failed 2 error: exter

Re: [BUG] can not escape sharps in git config file

2016-05-24 Thread Jean-Noël Avila
Forgot to add: ± git --version git version 2.8.3 -- 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 http://vger.kernel.org/majordomo-info.html

Re: [Opinion gathering] Git remote whitelist/blacklist

2016-05-24 Thread Lars Schneider
> On 24 May 2016, at 06:12, Francois Beutin > wrote: > On May 20, 2016 10:22 AM, Francois Beutin wrote: We (Ensimag students) plan to implement the "remote whitelist/blacklist" feature described in the SoC 2016 ideas, but first I would like to be sure we agree on w

t1400 test failures

2016-05-24 Thread Armin Kunaschik
Hello, I have 2 failed tests here: large transaction creating branches does not burst open file limit large transaction deleting branches does not burst open file limit both tests fail because of the decreased file limit: git-2.8.3/t/../bin-wrappers/git: bad file unit number The tests run fine o

Re: [BUG] can not escape sharps in git config file

2016-05-24 Thread Jean-Noël Avila
My mistake, sorry for the noise, JFTR: * only double quotes can fully escape a string (it is safer to enclose the whole value in double quotes) * backslashes have to be doubled because they are interpreted by git So [filter "kicad_sch"] clean = "sed -E 's/#(PWR|FLG)[0-9]+/#\\1?/'" smu

Re: Please add a git config option to make --show-signature the default

2016-05-24 Thread Johannes Schindelin
Hi Austin, On Mon, 23 May 2016, Austin English wrote: > As stated in title, I'd like to see an option to enable GPG signature > by default. I see an option was mentioned in the mail's subject line, but no indication which command you want to assume implicitly that this option was passed. Care t

Re: [PATCH] builtin/commit.c: memoize git-path for COMMIT_EDITMSG

2016-05-24 Thread Pranit Bauva
Hey Matthieu, On Tue, May 24, 2016 at 1:41 PM, Matthieu Moy wrote: > Junio C Hamano writes: > >> Pranit Bauva writes: >> >>> static const char *use_message_buffer; >>> -static const char commit_editmsg[] = "COMMIT_EDITMSG"; >>> +static const char commit_editmsg_path[] = git_path_commit_editmsg

Re: Reviews for the first patches of pclouds/narrow-checkout

2016-05-24 Thread Duy Nguyen
On Tue, May 24, 2016 at 1:26 AM, Stefan Beller wrote: > Hi, > > so I started looking into your narrow checkout branch and started reviewing > the patches. Thanks for working on the narrow checkout! > > Reviewed-by: Stefan Beller (just asking for signoff) > tree.c: break long lines > read-

Re: Odd Difference Between Windows Git and Standard Git

2016-05-24 Thread Johannes Schindelin
Hi, On Tue, 24 May 2016, Torsten Bögershausen wrote: > On 05/23/2016 08:52 PM, Junio C Hamano wrote: > > Johannes Schindelin writes: > > > > > > Of course, if you are doing network mount between systems with and > > > > without filemode support, the result would depend on where you did > > > > t

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

2016-05-24 Thread Samuel GROOT
On 05/23/2016 09:55 PM, Eric Wong wrote: Tom Russello wrote: This new option takes an email message file, parses it, fills the "To", "Subject" and "Cc" fields appropriately and quote the message. This option involves the `--compose` mode to edit the cover letter quoting the given email. Coo

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

2016-05-24 Thread Matthieu Moy
Samuel GROOT writes: > On 05/23/2016 09:55 PM, Eric Wong wrote: >> Tom Russello wrote: >>> This new option takes an email message file, parses it, fills the "To", >>> "Subject" and "Cc" fields appropriately and quote the message. >>> This option involves the `--compose` mode to edit the cover le

Re: [Opinion gathering] Git remote whitelist/blacklist

2016-05-24 Thread Matthieu Moy
Lars Schneider writes: > To answer your question, > I would reject the push (because the remote is in the denied list) and > print a warning to point out the conflicting configs to the user. So, when trying a forbidden push, Git would deny it and the only way to force the push would be to remove

Re: Small rerere in rebase regression

2016-05-24 Thread Johannes Schindelin
Hi, On Mon, 23 May 2016, Junio C Hamano wrote: > Johannes Sixt writes: > > > I also come to the conclusion that die_with_patch shouldn't have to > > have a call to "git rerere". die_with_patch can be called after "git > > cherry-pick", "git merge", "git commit", all of which have their own > >

[PATCH] userdiff: add built-in pattern for CSS

2016-05-24 Thread William Duclot
CSS is widely used, motivating it being included as a built-in pattern. It must be noted that the word_regex for CSS (i.e. the regex defining what is a word in the language) does not consider '.' and '#' characters (in CSS selectors) to be part of the word. This behavior is documented by the test

t7800 test failure

2016-05-24 Thread Armin Kunaschik
t7800 fails on systems where readlink (GNUism?) is not available. An easy workaround for the very basic readlink usage of this test would be to use a shell function like this: --- diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index ff7a9e9..be3d19f 100755 --- a/t/t7800-difftool.sh +++ b/t

[L10N] Kickoff of translation for Git 2.9.0 round 1

2016-05-24 Thread Jiang Xin
Hi guys, Git v2.9.0-rc0 has been released, and it's time to start new round of git l10n. This time there are 104 updated messages need to be translated since last update: l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed) Generate po/git.pot from v2.9.0-rc0 for git v2.9.0 l10n round 1.

Re: [Opinion gathering] Git remote whitelist/blacklist

2016-05-24 Thread Junio C Hamano
On Tue, May 24, 2016 at 5:55 AM, Matthieu Moy wrote: > So, when trying a forbidden push, Git would deny it and the only way to > force the push would be to remove the blacklist from the config, right? > > Probably the sanest way to go. I thought about adding a "git push > --force-even-if-in-blackl

RE: [Opinion gathering] Git remote whitelist/blacklist

2016-05-24 Thread Randall S. Becker
On May 24, 2016 12:08 PM, Matthieu Moy wrote: > > So, when trying a forbidden push, Git would deny it and the only way > > to force the push would be to remove the blacklist from the config, right? > > > > Probably the sanest way to go. I thought about adding a "git push > > --force-even-if-in-blac

Re: [Opinion gathering] Git remote whitelist/blacklist

2016-05-24 Thread Junio C Hamano
On Tue, May 24, 2016 at 9:16 AM, Randall S. Becker wrote: > May be missing the point, but isn't the original intent to provide > policy-based to control the push I didn't get the impression that those who are proposing were interested in a "policy that you have to obey" at all. Isn't this more a

t7610-mergetool.sh test failure

2016-05-24 Thread Armin Kunaschik
t7610-mergetool.sh fails on systems without mktemp. mktemp is used in git-mergetool.sh and throws an error when it's not available. error: mktemp is needed when 'mergetool.writeToTemp' is true I see 2 options: 1. code around it, write an own mktemp, maybe use the test-mktemp as a basis. 2. disabl

Re: t7610-mergetool.sh test failure

2016-05-24 Thread Junio C Hamano
On Tue, May 24, 2016 at 9:44 AM, Armin Kunaschik wrote: > t7610-mergetool.sh fails on systems without mktemp. > > mktemp is used in git-mergetool.sh and throws an error when it's not > available. > error: mktemp is needed when 'mergetool.writeToTemp' is true > > I see 2 options: > 1. code around

Re: t7800 test failure

2016-05-24 Thread Matthieu Moy
Armin Kunaschik writes: > t7800 fails on systems where readlink (GNUism?) is not available. I don't think it's POSIX, but it is present on all POSIX-like systems I know. On which system did you get the issue? > +readlink() { ls -ld "$1" | sed 's/.* -> //'; } This is much less robust than the a

Re: t7610-mergetool.sh test failure

2016-05-24 Thread Armin Kunaschik
On Tue, May 24, 2016 at 6:45 PM, Junio C Hamano wrote: > 3. find and install mktemp? Sure, but which one? :-) mktemp is not mentioned in POSIX. http://stackoverflow.com/questions/2792675/how-portable-is-mktemp1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a mes

Re: t7800 test failure

2016-05-24 Thread Junio C Hamano
Matthieu Moy writes: > Armin Kunaschik writes: > >> t7800 fails on systems where readlink (GNUism?) is not available. > > I don't think it's POSIX, but it is present on all POSIX-like systems I > know. On which system did you get the issue? > >> +readlink() { ls -ld "$1" | sed 's/.* -> //'; } >

Re: [PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION

2016-05-24 Thread Junio C Hamano
Ville Skyttä writes: > When the shell is in "nounset" or "set -u" mode, referencing unset or > null variables results in an error. Protect $ZSH_VERSION and > $BASH_VERSION against that. > > Signed-off-by: Ville Skyttä > --- Makes sense from a cursory look. Thanks. > contrib/completion/git-pr

Re: t7800 test failure

2016-05-24 Thread Armin Kunaschik
On Tue, May 24, 2016 at 6:57 PM, Junio C Hamano wrote: > Matthieu Moy writes: > >> Armin Kunaschik writes: >> >>> t7800 fails on systems where readlink (GNUism?) is not available. >> >> I don't think it's POSIX, but it is present on all POSIX-like systems I >> know. On which system did you get t

Re: [PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION

2016-05-24 Thread Junio C Hamano
Ville Skyttä writes: > When the shell is in "nounset" or "set -u" mode, referencing unset or > null variables results in an error. Protect $ZSH_VERSION and > $BASH_VERSION against that. > local ps1_expanded=yes > - [ -z "$ZSH_VERSION" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no > -

Re: t7800 test failure

2016-05-24 Thread Junio C Hamano
Armin Kunaschik writes: >> I wouldn't allow it in our scripted Porcelain, but the environment >> of our test scripts are under our control, so I do not think it is a >> problem ("ls piped to sed" has been an established idiom before >> readlink(1) was widely accepted, by the way). > > I think so

Re: [PATCH v8 3/3] bisect--helper: `write_terms` shell function in C

2016-05-24 Thread Junio C Hamano
Christian Couder writes: >> diff --git a/git-bisect.sh b/git-bisect.sh >> index 7d7965d..cd39bd0 100755 >> --- a/git-bisect.sh >> +++ b/git-bisect.sh >> @@ -210,7 +210,7 @@ bisect_start() { >> eval "$eval true" && >> if test $must_write_terms -eq 1 >> then >> -

Re: [Bug?] log -p -W showing the whole file for a patch that adds to the end?

2016-05-24 Thread Junio C Hamano
René Scharfe writes: > diff: factor out match_func_rec() > diff: handle appended chunks better with -W > diff: ignore empty lines before added functions with -W > diff: don't include common trailing empty lines with -W > grep: don't extend context to trailing empty lines with -W > > gr

Re: [PATCH] gitweb: fix link to parent diff with pathinfo

2016-05-24 Thread Junio C Hamano
Richard Braun writes: > Gitweb, when used with PATH_INFO, shows a link to parent diff > like http://somedomain/somerepo.git/commitdiff/somehash?hp=parenthash. > That link reports "400 - Invalid hash parameter". > > As I understand it, it should instead directly point to the parent diff, > i.e. tu

Re: [PATCH] gitweb: fix link to parent diff with pathinfo

2016-05-24 Thread Richard Braun
On Tue, May 24, 2016 at 11:17:28AM -0700, Junio C Hamano wrote: > Pinging... Hum, see [1]. Tell me if I need to resend. -- Richard Braun Pacte Novation / Novasys Ingénierie [1] http://git.661346.n2.nabble.com/PATCH-gitweb-fix-link-to-parent-diff-with-pathinfo-td7655482.html -- To unsubscribe

Re: [PATCH v8 3/3] bisect--helper: `write_terms` shell function in C

2016-05-24 Thread Pranit Bauva
Hey Christian, On Tue, May 24, 2016 at 1:03 PM, Christian Couder wrote: > On Tue, May 24, 2016 at 9:21 AM, Pranit Bauva wrote: >> diff --git a/git-bisect.sh b/git-bisect.sh >> index 7d7965d..cd39bd0 100755 >> --- a/git-bisect.sh >> +++ b/git-bisect.sh >> @@ -210,7 +210,7 @@ bisect_start() { >>

Re: [PATCH v7 2/2] convert: ce_compare_data() checks for a sha1 of a path

2016-05-24 Thread Junio C Hamano
tbo...@web.de writes: > From: Torsten Bögershausen > > To compare a file in working tree with the index, convert_to_git() is used, > the result is hashed and the hash value compared with ce->sha1. > > Deep down would_convert_crlf_at_commit() is invoked, to check if CRLF > are converted or not. >

Re: [PATCH] gitweb: fix link to parent diff with pathinfo

2016-05-24 Thread Junio C Hamano
Richard Braun writes: > On Tue, May 24, 2016 at 11:17:28AM -0700, Junio C Hamano wrote: >> Pinging... > > Hum, see [1]. > > Tell me if I need to resend. Sorry, check the "To:" field of the message you are responding to. The ping was not meant to (and was not addressed to) you. It asked for comm

[PATCH v9 0/3] bisect--helper: check_term_format() and write_terms()

2016-05-24 Thread Pranit Bauva
Here is the link to v8[1]. This has a few modifications. Changes wrt v8 as suggested by Christian are: * Remove the redundant `|| exit` Pranit Bauva (3): bisect--helper: use OPT_CMDMODE instead of OPT_BOOL bisect: rewrite `check_term_format` shell function in C bisect--helper: `write_term

[PATCH v9 2/3] bisect: rewrite `check_term_format` shell function in C

2016-05-24 Thread Pranit Bauva
Reimplement the `check_term_format` shell function in C and add a `--check-term-format` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--check-term-format` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As more functions

[PATCH v9 1/3] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-24 Thread Pranit Bauva
`--next-all` is meant to be used as a subcommand to support multiple "operation mode" though the current implementation does not contain any other subcommand along side with `--next-all` but further commits will include some more subcommands. Helped-by: Johannes Schindelin Mentored-by: Lars Schne

  1   2   >