git subtree merge deletes files in top directory

Hi, I'm trying to add a subtree which contains a folder with the same name as the subtree directory itself. Adding seems to work, but if i pull after the subtree remote changed, files in my top directory are deleted and everything seems to have "moved up" one directory - although i specify a

Re: Best "triangle" workflow setup?

On Fri, May 12, 2017 at 09:53:23AM -0500, Robert Dailey wrote: > Thanks, just curious, where in the git documentation is the "origin" > to "origin/HEAD" resolution documented? I checked the git-revisions > page but it doesn't seem to mention it there. Thanks for explaining > though. In

Re: [PATCH v5] fetch-pack: always allow fetching of literal SHA1s

On Fri, May 12, 2017 at 11:00:36AM -0700, Jonathan Tan wrote: > > @@ -617,7 +632,8 @@ static void filter_refs(struct fetch_pack_args *args, > > else if (cmp == 0) { > > keep = 1; /* definitely have it */ > >

Re: [PATCH v6] fetch-pack: always allow fetching of literal SHA1s

On Fri, May 12, 2017 at 01:46:48PM -0700, Jonathan Tan wrote: > Change from v5: used "ensure_tip_oids_initialized" function instead. > This removes some of the muddiness (e.g. with newlist being modified > after the function). I don't think it really improves the muddiness. You are still calling

Re: [PATCH] hashmap: hashmap_get_next passes through keydata as well

On Fri, May 12, 2017 at 01:02:44PM -0700, Stefan Beller wrote: > The 'keydata' may be of value in the underlying compare function to decide > if the given two entries are the same. I had to scratch my head over this for a minute, because there isn't really any motivating example of what you're

Re: [PATCH v7 00/10] refactor the filter process code into a reusable module

On Mon, May 08, 2017 at 10:58:46AM +0900, Junio C Hamano wrote: > Will queue; during the pre-release freeze, new things would move > slowly, but let's see if we have more comments from others and then > merge it to 'next' soon after the 2.13 final. I gave it a fresh read-through. I had a few

Re: [PATCH v7 04/10] convert: move packet_write_line() into pkt-line as packet_writel()

On Fri, May 05, 2017 at 11:27:56AM -0400, Ben Peart wrote: > +int packet_writel(int fd, const char *line, ...); This isn't a new problem, but I noticed that this function should probably get annotated to describe its interface. Junio, can you pick up the patch below on top of Ben's series (or

Re: [PATCH v7 09/10] sub-process: move sub-process functions into separate files

On Fri, May 05, 2017 at 11:28:01AM -0400, Ben Peart wrote: > +static void subprocess_exit_handler(struct child_process *process) > +{ > + sigchain_push(SIGPIPE, SIG_IGN); > + /* Closing the pipe signals the subprocess to initiate a shutdown. */ > + close(process->in); > +

Re: What's cooking in git.git (May 2017, #04; Fri, 12)

On Fri, May 12, 2017 at 03:43:21PM +0900, Junio C Hamano wrote: > * sg/clone-refspec-from-command-line-config (2017-05-09) 2 commits > - git-clone --config order & fetching extra refs during initial clone > - clone: respect configured fetch respecs during initial fetch > > "git clone -c

Re: [PATCH v3] fetch-pack: always allow fetching of literal SHA1s

On Thu, May 11, 2017 at 10:00:50AM -0700, Brandon Williams wrote: > > None of this is your problem now either way; the advertisement-limiting > > extension is still vaporware, albeit one we've discussed a lot. I just > > wanted to make sure we weren't painting ourselves into any corners. And > >

[PATCH] doc: use https link to Wikipeai to avoid http redirect

Signed-off-by: Sven Strickroth --- Documentation/gitweb.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt index 96156e5e1..88450589a 100644 --- a/Documentation/gitweb.txt +++ b/Documentation/gitweb.txt @@

Re: [PATCH] fixup! log: add exhaustive tests for pattern style options & config

On Fri, May 12, 2017 at 12:50 PM, Johannes Schindelin wrote: > On Windows, `(1|2)` is not a valid file name, and therefore the tag > cannot be created as expected by the new test. > > So simply skip this test on Windows. Thanks for the hotfix. I'll fix this in my v2,

Re: [PATCH] usage.c: drop set_error_handle()

On 13/05/17 04:48, Jeff King wrote: > The set_error_handle() function was introduced by 3b331e926 > (vreportf: report to arbitrary filehandles, 2015-08-11) so > that run-command could send post-fork, pre-exec errors to > the parent's original stderr. > > That use went away in 79319b194

Re: [PATCH 11/29] grep: add a test helper function for less verbose -f \0 tests

On Fri, May 12, 2017 at 7:06 AM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Add a helper function to make the tests which check for patterns with >> \0 in them more succinct. Right now this isn't a big win, but >> subsequent commits will

Re: [PATCH 00/11] Start retiring .git/remotes/ and .git/branches/ for good

Jonathan Nieder writes: > Johannes Schindelin wrote: >> On Fri, 12 May 2017, Junio C Hamano wrote: > >>> And this one is also important. I do not think we had to touch any >>> code that handles .git/remotes/ or .git/branches when we extended >>> the .git/config based

Re: [PATCH] doc: use https link to Wikipeai to avoid http redirect

On Sat, May 13, 2017 at 11:54 AM, Sven Strickroth wrote: Spelling error: Wikipeai Looks good, but let's change these too while we're at it: $ git grep http://en.wikip Documentation/gitweb.txt:87:http://en.wikipedia.org/wiki/Query_string#URL_encoding[]), the difference

Re: [PATCH] fixup! log: add exhaustive tests for pattern style options & config

On Sat, May 13, 2017 at 1:44 AM, Jonathan Nieder wrote: > Johannes Schindelin wrote: > >> On Windows, `(1|2)` is not a valid file name, and therefore the tag >> cannot be created as expected by the new test. >> >> So simply skip this test on Windows. >> >> Signed-off-by:

Re: [PATCH] hashmap: hashmap_get_next passes through keydata as well

On Sat, May 13, 2017 at 1:50 AM, Jeff King wrote: > On Fri, May 12, 2017 at 01:02:44PM -0700, Stefan Beller wrote: > >> The 'keydata' may be of value in the underlying compare function to decide >> if the given two entries are the same. > > I had to scratch my head over this for a

Re: [PATCH] fixup! log: add exhaustive tests for pattern style options & config

Hi Jonathan, On Fri, 12 May 2017, Jonathan Nieder wrote: > Johannes Schindelin wrote: > > > On Windows, `(1|2)` is not a valid file name, and therefore the tag > > cannot be created as expected by the new test. > > > > So simply skip this test on Windows. > > > > Signed-off-by: Johannes

Re: [PATCH] Use https links to Wikipedia to avoid http redirects

On Sat, May 13, 2017 at 11:54 AM, Sven Strickroth wrote: > Signed-off-by: Sven Strickroth Thanks! FWIW: Reviewed-by: Ævar Arnfjörð Bjarmason > --- > Documentation/gitweb.txt | 2 +- > bisect.c | 2 +- > gitweb/gitweb.perl

Re: [PATCH] compat/regex: fix compilation on Windows

On Sat, May 13, 2017 at 8:30 PM, Johannes Schindelin wrote: > Hi Ævar, > > I originally replied in a very verbose manner, going step by step through > the "one-liner", but decided to rephrase everything. > > So here goes. > > On Sat, 13 May 2017, Ævar Arnfjörð

[PATCH 0/5] p0004: support being called by t/perf/run

p0004-lazy-init-name-hash.sh errors out if the test repo is too small, and doesn't generate any perf test results even if it finishes successfully. That prevents t/perf/run from running the whole test suite. This series tries to address these issues. p0004: simplify calls of

Re: [PATCH 09/29] grep: amend submodule recursion test for regex engine testing

On Fri, May 12, 2017 at 6:59 AM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Amend the submodule recursion test to prepare it for subsequent tests >> of whether it passes along the grep.patternType to the submodule >> greps. >> >> This is

Re: [PATCH 04/29] log: add exhaustive tests for pattern style options & config

On Fri, May 12, 2017 at 6:48 AM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Add exhaustive tests for how the different grep.patternType options & >> the corresponding command-line options affect git-log. >> ... >> The patterns being passed

Re: [PATCH] compat/regex: fix compilation on Windows

Hi Ævar, I originally replied in a very verbose manner, going step by step through the "one-liner", but decided to rephrase everything. So here goes. On Sat, 13 May 2017, Ævar Arnfjörð Bjarmason wrote: > Let's drop this current gawk import series. Well, the reason why you imported the current

Re: [PATCH v4 1/3] usability: don't ask questions if no reply is required

Am 13.05.2017 um 00:36 schrieb Junio C Hamano: Thanks, all three patches look good. Will queue. Let's merge them to 'next' soonish and eventually down to 'master' and 'maint'. The patches change translated strings. You should probably wait for an update of their translations before you

[PATCH 1/5] p0004: simplify calls of test-lazy-init-name-hash

The test library puts helpers into $PATH, so we can simply call them without specifying their location. The suffix $X is also not necessary because .exe files on Windows can be started without specifying their extension, and on other platforms it's empty anyway. Signed-off-by: Rene Scharfe

[PATCH 2/5] p0004: avoid using pipes

The return code of commands on the producing end of a pipe is ignored. Evaluate the outcome of test-lazy-init-name-hash by calling sort separately. Signed-off-by: Rene Scharfe --- t/perf/p0004-lazy-init-name-hash.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)

[PATCH 5/5] p0004: don't error out if test repo is too small

Repositories with less than 4000 entries are always handled using a single thread, causing test-lazy-init-name-hash --multi to error out. Don't abort the whole test script in that case, but simply skip the multi-threaded performance check. We can still use it to compare the single-threaded speed

Re: [PATCH v4 03/12] t/test-lib-functions.sh: allow to specify the tag name to test_commit

On Tue, Feb 12, 2013 at 11:17 AM, Brandon Casey wrote: > The part of test_commit() may not be appropriate for a tag name. > So let's allow test_commit to accept a fourth argument to specify the tag > name. [Kind of late to notice, I know] I see nobody spotted in four rounds

[PATCH 4/5] p0004: don't abort if multi-threaded is too slow

If the single-threaded variant beats the multi-threaded one then we may have a performance bug, but that doesn't justify aborting the test. Drop that check; we can compare the results for --single and --multi using the actual performance tests. Signed-off-by: Rene Scharfe ---

[PATCH 3/5] p0004: use test_perf

The perf test suite (more specifically: t/perf/aggregate.perl) requires each test script to write test results into a file, otherwise it aborts when aggregating. Add actual performance tests with test_perf to allow p0004 to be run together with other perf scripts. Calibrate the value for the

[PATCH] Use https links to Wikipedia to avoid http redirects

Signed-off-by: Sven Strickroth --- Documentation/gitweb.txt | 2 +- bisect.c | 2 +- gitweb/gitweb.perl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt index 96156e5e1..88450589a

Re: [PATCH] usage.c: drop set_error_handle()

On 05/12, Jeff King wrote: > The set_error_handle() function was introduced by 3b331e926 > (vreportf: report to arbitrary filehandles, 2015-08-11) so > that run-command could send post-fork, pre-exec errors to > the parent's original stderr. > > That use went away in 79319b194 (run-command:

[RFC PATCH v2 05/22] blame: move scoreboard structure to header

The scoreboard structure is core to the blame interface. Since scoreboard will be more exposed, rename it to blame_scoreboard to clarify what it is a part of. Signed-off-by: Jeff Smith --- blame.h | 29 builtin/blame.c | 83

[RFC PATCH v2 10/22] blame: move show_root flag to scoreboard

The show_root flag is used in parts of blame that are being moved to libgit, and should be accessible via the scoreboard structure. Signed-off-by: Jeff Smith --- blame.h | 1 + builtin/blame.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

[RFC PATCH v2 19/22] blame: move scoreboard-related methods to libgit

Signed-off-by: Jeff Smith --- blame.c | 1313 ++ blame.h | 11 + builtin/blame.c | 1330 +-- 3 files changed, 1330 insertions(+), 1324 deletions(-) diff

[RFC PATCH v2 02/22] blame: move textconv_object with related functions

textconv_object is used in places other than blame.c and should be moved to a more appropriate location. Other textconv related functions are located in diff.c so that seems as good a place as any. Signed-off-by: Jeff Smith --- builtin.h | 2 -- builtin/blame.c

[RFC PATCH v2 18/22] blame: move fake-commit-related methods to libgit

Signed-off-by: Jeff Smith --- blame.c | 203 +++- blame.h | 4 +- builtin/blame.c | 197 -- 3 files changed, 205 insertions(+), 199 deletions(-) diff

[RFC PATCH v2 04/22] blame: move origin and entry structures to header

The origin and blame_entry structures are core to the blame interface and reference each other. Since origin will be more exposed, rename it to blame_origin to clarify what it is a part of. Signed-off-by: Jeff Smith --- blame.h | 86 ++

[RFC PATCH v2 08/22] blame: move contents_from to scoreboard

The argument from --contents is used in parts of blame that are being moved to libgit, and should be accessible via the scoreboard structure. Signed-off-by: Jeff Smith --- blame.h | 3 +++ builtin/blame.c | 1 + 2 files changed, 4 insertions(+) diff --git a/blame.h

[RFC PATCH v2 07/22] blame: move copy/move thresholds to scoreboard

Copy and move score thresholds are used in parts of blame that are being moved to libgit, and should be accessible via the scoreboard structure. Signed-off-by: Jeff Smith --- blame.h | 10 ++ builtin/blame.c | 36 2 files

[RFC PATCH v2 15/22] blame: wrap blame_sort and compare_blame_final

The new method's interface is marginally cleaner than blame_sort, and will avoid the need to expose the compare_blame_final method. Signed-off-by: Jeff Smith --- builtin/blame.c | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git

[RFC PATCH v2 17/22] blame: move origin-related methods to libgit

Signed-off-by: Jeff Smith --- Makefile| 1 + blame.c | 62 + blame.h | 15 +++ builtin/blame.c | 120 4 files changed, 102 insertions(+), 96 deletions(-)

[RFC PATCH v2 20/22] blame: create scoreboard init function in libgit

Signed-off-by: Jeff Smith --- blame.c | 7 +++ blame.h | 2 ++ builtin/blame.c | 4 +--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/blame.c b/blame.c index 798e61b..17ebf64 100644 --- a/blame.c +++ b/blame.c @@ -1574,3 +1574,10 @@ void

[RFC PATCH v2 13/22] blame: make sanity_check use a callback in scoreboard

Allow the interface user to decide how to handle a failed sanity check, whether that be to output with the current state or to do nothing. Signed-off-by: Jeff Smith --- blame.h | 4 builtin/blame.c | 23 +++ 2 files changed, 19

[RFC PATCH v2 09/22] blame: move reverse flag to scoreboard

The reverse flag is used in parts of blame that are being moved to libgit, and should be accessible via the scoreboard structure. Signed-off-by: Jeff Smith --- blame.h | 3 +++ builtin/blame.c | 20 +++- 2 files changed, 14 insertions(+), 9

[RFC PATCH v2 00/22] Add blame to libgit

Rather than duplicate large portions of builtin/blame.c in cgit, it would be better to shift its core functionality into libgit.a. The functionality left in builtin/blame.c mostly relates to terminal presentation. Since initial patchset: Made commit titles consistent Broke some commits into

[RFC PATCH v2 03/22] blame: remove unused parameters

Clean up blame code before moving it into libgit Signed-off-by: Jeff Smith --- builtin/blame.c | 25 ++--- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index c419981..e30b3ef 100644 ---

[RFC PATCH v2 06/22] blame: move stat counters to scoreboard

Statistic counters are used in parts of blame that are being moved to libgit, and should be accessible via the scoreboard structure. Signed-off-by: Jeff Smith --- blame.h | 5 + builtin/blame.c | 29 - 2 files changed, 17

[RFC PATCH v2 16/22] blame: rework methods that determine 'final' commit

Either prepare_initial or prepare_final is used to determine which commit is marked as 'final'. Call the underlying methods directly to make this more clear. Signed-off-by: Jeff Smith --- builtin/blame.c | 49 +++-- 1 file changed,

[RFC PATCH v2 14/22] blame: move progess updates to a scoreboard callback

Allow the interface user to decide how to handle a progress update. Signed-off-by: Jeff Smith --- blame.h | 3 +++ builtin/blame.c | 24 ++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/blame.h b/blame.h index

[RFC PATCH v2 22/22] blame: create entry prepend function in libgit

Signed-off-by: Jeff Smith --- blame.c | 16 blame.h | 2 ++ builtin/blame.c | 11 +-- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/blame.c b/blame.c index f6c9cb7..00404b9 100644 --- a/blame.c +++ b/blame.c @@

[RFC PATCH v2 12/22] blame: move no_whole_file_rename flag to scoreboard

The no_whole_file_rename flag is used in parts of blame that are being moved to libgit, and should be accessible via the scoreboard structure. Signed-off-by: Jeff Smith --- blame.h | 1 + builtin/blame.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff

[RFC PATCH v2 11/22] blame: move xdl_opts flags to scoreboard

The xdl_opts flags are used in parts of blame that are being moved to libgit, and should be accessible via the scoreboard structure. Signed-off-by: Jeff Smith --- blame.h | 1 + builtin/blame.c | 7 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git

Re: [PATCH 0/3] interpret-trailers + commit -v bugfix

> As I said, I'm a little iffy on doing this unconditionally, but it may > be the least-bad solution. I'd just worry about collateral damage to > somebody who doesn't use commit.verbose, but has something scissors-like > in their commit message. > > If you were to switch out is_scissors_line()

[PATCH] interpret-trailers: obey scissors lines

If a commit message is being editted as "verbose", it will contain a scissors string ("-- >8 --") and a diff: my subject # >8 # Do not touch the line above. # Everything below will be removed. diff --git a/foo.txt b/foo.txt

checkout -b remotes/origin/ should not work

NEEDSWORK: checkout -b remotes/origin/ should not work, unless force is given (maybe?) (I just run into that, now I have a remote tracking branch that points at my detached HEAD. Oh well.)

Re: [PATCH] interpret-trailers: obey scissors lines

On Sat, May 13, 2017 at 08:39:23PM -0700, Brian Malehorn wrote: > If a commit message is being editted as "verbose", it will contain a > scissors string ("-- >8 --") and a diff: > > my subject > > # >8 > # Do not touch the line

Re: checkout -b remotes/origin/ should not work

On Sat, May 13, 2017 at 08:52:37PM -0700, Stefan Beller wrote: > NEEDSWORK: > > checkout -b remotes/origin/ should not work, unless force is > given (maybe?) > > (I just run into that, now I have a remote tracking branch that points > at my detached HEAD. Oh well.) To be pedantic, you have a

[PATCH 18/19] diff: buffer all output if asked to

Introduce a new option 'use_buffer' in the struct diff_options which controls whether all output is buffered up until all output is available. We'll have two new structs in diff.h, one of them 'buffered_patch_line' will be used to buffer each line, and the other 'buffered_patch_file_pair' will

[RFC PATCH 00/19] Diff machine: highlight moved lines.

For details on *why* see the commit message of the last commit. The first five patches are slight refactorings to get into good shape, the next patches are funneling all output through emit_line_*. The second last patch introduces an option to buffer up all output before printing, and then the

[PATCH 01/19] diff: readability fix

We already have dereferenced 'p->two' into a local variable 'two'. Use that. Signed-off-by: Stefan Beller --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 74283d9001..3f5bf8b5a4 100644 --- a/diff.c +++ b/diff.c @@

[PATCH 12/19] diff.c: convert emit_binary_diff_body to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 19/19] diff.c: color moved lines differently

When there is a lot of code moved around such as in 11979b9 (2005-11-18, "http.c: reorder to avoid compilation failure.") for example, the review process is quite hard, as it is not mentally challenging. It is a rather tedious process, that gets boring quickly. However you still need to read

[PATCH 06/19] diff: add emit_line_fmt

In the following patches we'll convert all printing functions to use the emit_line_* family of functions. Many of the printing functions to be converted are formatted. So offer a formatted function in the emit_line function family as well. Signed-off-by: Stefan Beller ---

[PATCH 03/19] diff.c: drop 'nofirst' from emit_line_0

In 250f79930d (diff.c: split emit_line() from the first char and the rest of the line, 2009-09-14) we introduced the local variable 'nofirst' that indicates if we have no first sign character. With the given implementation we had to use an extra variable unlike reusing 'first' because the lines

[PATCH 08/19] diff.c: convert builtin_diff to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 13/19] diff.c: convert show_stats to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 09/19] diff.c: convert emit_rewrite_diff to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 16/19] diff.c: convert diff_summary to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 10/19] diff.c: convert emit_rewrite_lines to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 14/19] diff.c: convert word diffing to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 11/19] submodule.c: convert show_submodule_summary to use emit_line_fmt

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 07/19] diff.c: convert fn_out_consume to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 17/19] diff.c: factor out emit_line_ws for coloring whitespaces

Introduce a helper that calls ws_check_emit. We'll have it as a helper as in a later patch we'll add buffering in there. In a later patch we want to buffer up all output and to do that we'll need to keep around information for outputting a line such as the whitespace information. We choose to put

[PATCH 02/19] diff: move line ending check into emit_hunk_header

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 05/19] diff.c: emit_line_0 can handle no color setting

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

[PATCH 04/19] diff.c: factor out diff_flush_patch_all_file_pairs

In a later patch we want to do more things before and after all filepairs are flushed. So factor flushing out all file pairs into its own function that the new code can be plugged in easily. Signed-off-by: Stefan Beller --- diff.c | 17 - 1 file changed, 12

[PATCH 15/19] diff.c: convert diff_flush to use emit_line_*

In a later patch, I want to propose an option to detect moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff

Re: [PATCH 18/19] diff: buffer all output if asked to

On Sat, May 13, 2017 at 09:01:16PM -0700, Stefan Beller wrote: > + for (i = 0; i < o->line_buffer_nr; i++); > + free((void*)o->line_buffer[i].line); I haven't looked at the patches yet, but this ";" on the for line is almost certainly a typo (gcc catches it due to

Re: [PATCH 18/19] diff: buffer all output if asked to

On Sat, May 13, 2017 at 9:06 PM, Jeff King wrote: > On Sat, May 13, 2017 at 09:01:16PM -0700, Stefan Beller wrote: > >> + for (i = 0; i < o->line_buffer_nr; i++); >> + free((void*)o->line_buffer[i].line); > > I haven't looked at the patches yet, but

[PATCH v2 10/29] grep: add tests for grep pattern types being passed to submodules

Add testing for grep pattern types being correctly passed to submodules. The pattern "(.|.)[\d]" matches differently under fixed (not at all), and then matches different lines under basic/extended & perl regular expressions, so this change asserts that the pattern type is passed along correctly.

[PATCH v2 12/29] grep: prepare for testing binary regexes containing rx metacharacters

Add setup code needed for testing regexes that contain both binary data and regex metacharacters. The POSIX regcomp() function inherently can't support that, because it takes a \0-delimited char *, but other regex engines APIs like PCRE v2 take a pattern/length pair, and are thus able to handle

[PATCH v2 11/29] grep: add a test helper function for less verbose -f \0 tests

Add a helper function to make the tests which check for patterns with \0 in them more succinct. Right now this isn't a big win, but subsequent commits will add a lot more of these tests. The helper is based on the match() function in t3070-wildmatch.sh. Signed-off-by: Ævar Arnfjörð Bjarmason

[PATCH v2 03/29] test-lib: rename the LIBPCRE prerequisite to PCRE

Rename the LIBPCRE prerequisite to PCRE. This is for preparation for libpcre2 support, where having just "LIBPCRE" would be confusing as it implies v1 of the library. None of these tests are incompatible between versions 1 & 2 of libpcre, it's less confusing to give them a more general name to

[PATCH v2 05/29] grep: add a test asserting that --perl-regexp dies when !PCRE

Add a test asserting that when --perl-regexp (and -P for grep) is given to git-grep & git-log that we die with an error. In developing the PCRE v2 series I introduced a regression where -P would (through control-flow fall-through) become synonymous with basic POSIX matching. I.e. 'git grep -P

[PATCH v2 07/29] grep: change non-ASCII -i test to stop using --debug

Change a non-ASCII case-insensitive test case to stop using --debug, and instead simply test for the expected results. The test coverage remains the same with this change, but the test won't break due to internal refactoring. This test was added in commit 793dc676e0 ("grep/icase: avoid kwsset

[PATCH v2 09/29] grep: amend submodule recursion test for regex engine testing

Amend the submodule recursion test to prepare it for subsequent tests of whether it passes along the grep.patternType to the submodule greps. This is the result of searching & replacing: foobar -> (1|2)d(3|4) foo-> (1|2) bar-> (3|4) Currently there's no tests for whether

[PATCH v2 01/29] Makefile & configure: reword inaccurate comment about PCRE

Reword an outdated & inaccurate comment which suggests that only git-grep can use PCRE. This comment was added back when PCRE support was initially added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09), and was true at the time. It hasn't been telling the full truth since git-log

[PATCH v2 04/29] log: add exhaustive tests for pattern style options & config

Add exhaustive tests for how the different grep.patternType options & the corresponding command-line options affect git-log. Before this change it was possible to patch revision.c so that the --basic-regexp option was synonymous with --extended-regexp, and --perl-regexp wasn't recognized at all,

[PATCH v2 00/29] Easy to review grep & pre-PCRE changes

Easy to review? 29 patches? Are you kidding me?! As noted in v1 (<20170511091829.5634-1-ava...@gmail.com>; https://public-inbox.org/git/20170511091829.5634-1-ava...@gmail.com/) these are all doc, test, refactoring etc. changes needed by the subsequent "PCRE v2, PCRE v1 JIT, log -P & fixes"

[PATCH v2 06/29] grep: add a test for backreferences in PCRE patterns

Add a test for backreferences such as (.)\1 in PCRE patterns. This test ensures that the PCRE_NO_AUTO_CAPTURE option isn't turned on. Before this change turning it on would break these sort of patterns, but wouldn't break any tests. Signed-off-by: Ævar Arnfjörð Bjarmason ---

[PATCH v2 13/29] grep: add tests to fix blind spots with \0 patterns

Address a big blind spot in the tests for patterns containing \0. The is_fixed() function considers any string that contains \0 fixed, even if it contains regular expression metacharacters, those patterns are currently matched with kwset. Before this change removing that memchr(s, 0, len) check

[PATCH v2 19/29] grep: remove redundant regflags assignment under PCRE

Remove a redundant assignment to the "regflags" variable. This variable is only used for POSIX regular expression matching, not when the PCRE library is used. This redundant assignment was added as a result of copy/paste programming in commit 84befcd0a4 ("grep: add a grep.patternType

[PATCH v2 02/29] grep & rev-list doc: stop promising libpcre for --perl-regexp

Stop promising in our grep & rev-list options documentation that we're always going to be using libpcre when given the --perl-regexp option. Instead talk about using "Perl-compatible regular expressions" and using these types of patterns using "a compile-time dependency". Saying "libpcre" means

[PATCH v2 08/29] grep: add tests for --threads=N and grep.threads

Add tests for --threads=N being supplied on the command-line, or when grep.threads=N being supplied in the configuration. When the threading support was made run-time configurable in commit 89f09dd34e ("grep: add --threads= option and grep.threads configuration", 2015-12-15) no tests were added

[PATCH v2 18/29] grep: catch a missing enum in switch statement

Add a die(...) to a default case for the switch statement selecting between grep pattern types under --recurse-submodules. Normally this would be caught by -Wswitch, but the grep_pattern_type type is converted to int by going through parse_options(). Changing the argument type passed to

[PATCH v2 16/29] perf: add a performance comparison test of grep -G, -E and -P

Add a very basic performance comparison test comparing the POSIX basic, extended and perl engines. In theory the "basic" and "extended" engines should be implemented using the same underlying code with a slightly different pattern parser, but some implementations may not do this. Jump through

[PATCH v2 15/29] perf: emit progress output when unpacking & building

Amend the t/perf/run output so that in addition to the "Running N tests" heading currently being emitted, it also emits "Unpacking $rev" and "Building $rev" when setting up the build/$rev directory & when building it, respectively. This makes it easier to see what's going on and what revision is

  1   2   >