Re: AW: Understanding behavior of git blame -M

Sokolov, Konstantin (ext) konstantin.sokolov@siemens.com writes: Hi David, thank you very much for the exhaustive answer. The keyword hunk made me try a little bit more. So I realized that -M works as expected when at least three lines are moved. From your answer I discern that you

You do not have permission to post to the ms...@lists.myitforum.com list

Sorry, you do not have permission to post to the ms...@lists.myitforum.com mailing list. -- 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: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

On Wed, Aug 06, 2014 at 07:32:14AM +0200, Steffen Prohaska wrote: [...] The expectation on the process size is tested using /usr/bin/time. An alternative would have been tcsh, which could be used to print memory information as follows: tcsh -c 'set time=(0 %M); cmd' Although the

[GIT PULL] l10n updates for 2.1.0 round 1

I'm sorry this pull request is late for git v2.1.0. I should send it out yesterday night using the network of my new house, but after 2 weeks' business travel and home moving, I'm a bit lazy. And German translation is still under review, so it is not included in this pull request. The following

[PATCH] clean: use f(void) instead of f() to declare a pointer to a function without arguments

Explicitly state that menu_item functions like clean_cmd don't take any arguments by using void instead of an empty parameter list. Found using gcc -Wstrict-prototypes. Signed-off-by: Rene Scharfe l@web.de --- builtin/clean.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH] read-cache.c: Ensure unmerged entries are removed

I'd like to add some tests too for this, but I don't know how to reproduce this state with git commands only, is there any way to add entries to the index without checkings? Or maybe it could be done by creating a test- command that adds the entries to an index? Thanks. On Fri, Aug 15, 2014 at

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

On Aug 16, 2014, at 12:27 PM, John Keeping j...@keeping.me.uk wrote: +test_expect_success HAVE_MAX_MEM_USAGE \ +'filtering large input to small output should use little memory' ' +git config filter.devnull.clean cat /dev/null +git config filter.devnull.required true +for i in

[PATCH v13 03/11] trailer: read and process config information

Read the configuration to get trailer information, and then process it and store it in a doubly linked list. The config information is stored in the list whose first item is pointed to by: static struct trailer_item *first_conf_item; Signed-off-by: Christian Couder chrisc...@tuxfamily.org

[PATCH v13 05/11] trailer: parse trailers from file or stdin

Read trailers from a file or from stdin, parse the trailers and then put the result into a doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 123

[PATCH v13 00/11] Add interpret-trailers builtin

This patch series implements a new command: git interpret-trailers and an infrastructure to process trailers that can be reused, for example in commit.c. 1) Rationale: This command should help with RFC 822 style headers, called trailers, that are found at the end of commit messages.

[PATCH v13 04/11] trailer: process command line trailer arguments

Parse the trailer command line arguments and put the result into an arg_tok doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 125 ++ 1 file

[PATCH v13 01/11] trailer: add data structures and basic functions

We will use a doubly linked list to store all information about trailers and their configuration. This way we can easily remove or add trailers to or from trailer lists while traversing the lists in either direction. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C

[PATCH v13 02/11] trailer: process trailers from input message and arguments

Implement the logic to process trailers from the input message and from arguments. At the beginning trailers from the input message are in their own in_tok doubly linked list, and trailers from arguments are in their own arg_tok doubly linked list. The lists are traversed and when an arg_tok

[PATCH v13 06/11] trailer: put all the processing together and print

This patch adds the process_trailers() function that calls all the previously added processing functions and then prints the results on the standard output. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 81

[PATCH v13 08/11] trailer: add tests for git interpret-trailers

Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 726 ++ 1 file changed, 726 insertions(+) create mode 100755 t/t7513-interpret-trailers.sh diff --git

[PATCH v13 10/11] trailer: add tests for commands in config file

And add a few other tests for some special cases. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 124 ++ 1 file changed, 124 insertions(+) diff --git

[PATCH v13 11/11] Documentation: add documentation for 'git interpret-trailers'

While at it add git-interpret-trailers to command-list.txt. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/git-interpret-trailers.txt | 308 +++ command-list.txt | 1 +

[PATCH v13 07/11] trailer: add interpret-trailers command

This patch adds the git interpret-trailers command. This command uses the previously added process_trailers() function in trailer.c. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- .gitignore | 1 + Makefile

[PATCH v13 09/11] trailer: execute command from 'trailer.name.command'

Let the user specify a command that will give on its standard output the value to use for the specified trailer. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 66

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

Steffen Prohaska proha...@zib.de writes: The test should confirm that the the file that is added is not mmapped to memory. RSS doesn't tell you that. You can mmap a big file without RSS getting bigger. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53

Re: [PATCH v3 03/10] setup: convert setup_git_directory_gently_1 et al. to strbuf

On 2014-07-28 20.26, René Scharfe wrote: Convert setup_git_directory_gently_1() and its helper functions setup_explicit_git_dir(), setup_discovered_git_dir() and setup_bare_git_dir() to use a struct strbuf to hold the current working directory. Replacing the PATH_MAX-sized buffer used before

[PATCH 2/2] Push the Makefile variable NATIVE_CRLF to C

Re-do the fix in 757543ae0c5d8d: Propagate the Makefile variable NATIVE_CRLF to the C preprocessor Signed-off-by: Torsten Bögershausen tbo...@web.de --- Makefile | 4 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 63a210d..00ba537 100644 --- a/Makefile +++

[PATCH 1/2] t0027: Tests for core.eol=native, eol=lf, eol=crlf

Add test cases for core.eol native and (unset). (MINGW uses CRLF, all other systems LF as native line endings) Add test cases for the attributes eol=lf and eol=crlf Other minor changes: - Use the more portable 'tr' instead of 'od -c' to convert '\n' into 'Q' and '\0' into 'N' - Style fixes

t5534 broken when gpg not installed

(I couldn't find a post for this patch) The following is needed for systems without gpg to make t5534 pass: diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh index 3acc864..ee5aaff 100755 --- a/t/t5534-push-signed.sh +++ b/t/t5534-push-signed.sh @@ -45,7 +45,7 @@ test_expect_success

Re: [PATCH v3 03/10] setup: convert setup_git_directory_gently_1 et al. to strbuf

Is there a chance to squueze this in: $ git diff diff --git a/setup.c b/setup.c index 526cdf6..fb61860 100644 --- a/setup.c +++ b/setup.c @@ -734,7 +734,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok) string_list_clear(ceiling_dirs, 0);

Re: [PATCH v13 00/11] Add interpret-trailers builtin

On Sat, Aug 16, 2014 at 6:06 PM, Christian Couder chrisc...@tuxfamily.org wrote: 3) Changes since version 12, thanks to Jakub, Michael, Johan and Junio: * end and start values for trailer.token.where have been implemented * end has been made the default value for where, but this default

[PATCH] run-command: introduce CHILD_PROCESS_INIT

Most struct child_process variables are cleared using memset right after declaration. Provide a macro, CHILD_PROCESS_INIT, that can be used to initialize them statically instead. That's shorter, doesn't require a function call and is slightly more readable (especially given that we already have

Feature Request: `git remote prune --all`

I would like to propose the addition of a `git remote prune --all` command option or similar mechanism for pruning all remotes in a repository. For lack of such a feature, I've been using the following bash alias: alias git-remote-prune-all='for REMOTE in `git remote`; do echo Pruning $REMOTE;