Re: [musl] Re: Regression: git no longer works with musl libc's regex impl

* Johannes Schindelin [2016-10-05 13:17:49 +0200]: > I had a brief look at the source code (you use backtracking... hopefully > nobody uses musl to parse regular expressions from untrusted, or > inexperienced, sources [*1*]), and it seems that the regex code might

Re: [PATCH v2 17/25] sequencer: support amending commits

Hi Junio, On Mon, 12 Sep 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This teaches the sequencer_commit() function to take an argument that > > will allow us to implement "todo" commands that need to amend the commit > > messages ("fixup",

Re: [PATCH v2 19/25] sequencer: remember do_recursive_merge()'s return value

Hi Junio, On Mon, 12 Sep 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The return value of do_recursive_merge() may be positive (indicating merge > > conflicts), so let's OR later error conditions so as not to overwrite them > > with 0. > > Are

Re: [musl] Re: Regression: git no longer works with musl libc's regex impl

On Wed, 5 Oct 2016 12:41:50 +0200 (CEST) Johannes Schindelin wrote: > > > > Wow, I don't know that Windows is a git's first-tier platform now, > > It is. Git for Windows is maintained by me, and I make as certain as I can > that it works fine. > And yes, we have

Re: [PATCH v2 04/25] sequencer: future-proof remove_sequencer_state()

Hi Junio, On Mon, 12 Sep 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > +static const char *get_dir(const struct replay_opts *opts) > > +{ > > + return git_path_seq_dir(); > > +} > > Presumably this is what "In a couple of commits" meant, i.e.

Re: [PATCH v2 05/25] sequencer: allow the sequencer to take custody of malloc()ed data

Hi Junio, On Mon, 12 Sep 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The sequencer is our attempt to lib-ify cherry-pick. Yet it behaves > > like a one-shot command when it reads its configuration: memory is > > allocated and released only when

Re: git commit -p with file arguments

Duy Nguyen writes: >> At the least I think we should clarify this in the document. > > How about something like this? Would it help? I think it captures the current behavior well. -- Christian Neukirchen http://chneukirchen.org

Re: [PATCH v3 0/6] Pull out require_clean_work_tree() functionality from builtin/pull.c

Hi Junio, On Tue, 4 Oct 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This is the 5th last patch series of my work to accelerate interactive > > rebases in particular on Windows. > > Offtopic, but I am always confused by what you might mean by

Re: [PATCH v3 3/6] Make the require_clean_work_tree() function reusable

Hi Junio, On Tue, 4 Oct 2016, Junio C Hamano wrote: > I'd tweak the message while queuing, though. > > wt-status: make the require_clean_work_tree() function reusable > > The function "git pull" uses to stop the user when the working > tree has changes is useful in other

Re: [musl] Re: Regression: git no longer works with musl libc's regex impl

Hi Rich, On Tue, 4 Oct 2016, Rich Felker wrote: > On Tue, Oct 04, 2016 at 06:08:33PM +0200, Johannes Schindelin wrote: > > > And lastly, the best alternative would be to teach musl about > > REG_STARTEND, as it is rather useful a feature. > > Maybe, but it seems fundamentally costly to support

RE: [musl] Re: Regression: git no longer works with musl libc's regex impl

Hi writeonce, On Tue, 4 Oct 2016, writeo...@midipix.org wrote: > < On Tue, 4 Oct 2016, Rich Felker wrote: > < > < > On Tue, Oct 04, 2016 at 11:27:22AM -0400, Jeff King wrote: > < > > On Tue, Oct 04, 2016 at 11:08:48AM -0400, Rich Felker wrote: > < > > > < > > > 1. is nonzero mod page size, it

Re: "Purposes, Concepts,Misfits, and a Redesign of Git" (a research paper)

On Wed, Oct 5, 2016 at 5:14 PM, Jakub Narębski wrote: > [git@vger.kernel.org does not accept HTML emails] > > I just hope that this email don't get mangled too much... > > On 5 October 2016 at 04:55, Santiago Perez De Rosso > wrote: >> On Fri, Sep 30,

Re: [musl] Re: Regression: git no longer works with musl libc's regex impl

Hi James, On Wed, 5 Oct 2016, James B wrote: > On Tue, 4 Oct 2016 18:08:33 +0200 (CEST) > Johannes Schindelin wrote: > > > No, it is not. You quote POSIX, but the matter of the fact is that we > > use a subset of POSIX in order to be able to keep things running on >

Re: git commit -p with file arguments

On Fri, Sep 09, 2016 at 05:54:30PM +0700, Duy Nguyen wrote: > On Tue, Sep 6, 2016 at 4:08 AM, Christian Neukirchen > wrote: > > Hi, > > > > I noticed the following suprising behavior: > > > > % git --version > > git version 2.10.0 > > > > % git add bar > > % git status -s

Re: Feature Request: user defined suffix for temp files created by git-mergetool

Hi David, thank you very much for your reply. Today I realized, that my attachment has been cut off, so I sent it in the morning [1]. I believe, that most of answer can be find in my previous email from this morning. Only change, that should be done by this request is add possibility to edit

Re: "Purposes, Concepts,Misfits, and a Redesign of Git" (a research paper)

[git@vger.kernel.org does not accept HTML emails] I just hope that this email don't get mangled too much... On 5 October 2016 at 04:55, Santiago Perez De Rosso wrote: > On Fri, Sep 30, 2016 at 6:25 PM Jakub Narębski wrote: >> W dniu 30.09.2016 o 18:14,

Re: Feature Request: user defined suffix for temp files created by git-mergetool

On Tue, Oct 04, 2016 at 01:18:47AM -0400, Josef Ridky wrote: > Hi Anatoly, > > > | Sent: Monday, October 3, 2016 5:18:44 PM > | > | Hi Josef, > | > | > | On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky wrote: > | > In several projects, we are using git mergetool for comparing

Re: [PATCH 1/3] Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"

On Tue, Oct 4, 2016 at 11:15 PM, Junio C Hamano wrote: > Duy Nguyen writes: > >> We don't use it internally _yet_. I need to go through all the >> external diff code and see --shift-ita should be there. The end goal >> is still changing the default behavior

Re: Feature Request: user defined suffix for temp files created by git-mergetool

Hi, I have just realize, that my attachment has been cut off from my previous message. Below you can find patch with requested change. Add support for user defined suffix part of name of temporary files created by git mergetool --- Documentation/git-mergetool.txt | 26 -

<    1   2