On Mon, Jul 13, 2015 at 03:31:37PM -0700, Junio C Hamano wrote:
> A fix is to edit the patch to replace that "flags);" line with full
> "return delete_ref()" line and save it. Then running
>
> $ git am
>
> (no argument) is supposed to read from the corrected patch file and
> continue the appli
While using this series for real work today, I found another bug
that is unfortunately a show-stopper for my workflow.
Store 7 patches from David Turner to a file, ./+dt-7, starting at
http://thread.gmane.org/gmane.comp.version-control.git/273786 and
then:
$ git checkout master...dt/refs-backen
Paul Tan writes:
>> However, I am reluctant to blindly replace assert(!state->field)
>> with free(state->field). Are there cases where we _must_ call a
>> function that sets these fields at most once?
>
> I wouldn't say we are "blindly" replacing them.
I said "I was", not "you and me". If ther
Hi,
(Sorry for the late reply. Caught a nasty stomach bug that kept me in
bed for a while ><)
On Thu, Jul 9, 2015 at 2:00 PM, Junio C Hamano wrote:
> What I pushed out tonight should have SQUASH??? (or fixup!) that
> splits this into appropriate steps in your series. Please check.
Yeah they lo
Paul Tan writes:
> So the fix would be to remove the assert()s, as follows:
What I pushed out tonight should have SQUASH??? (or fixup!) that
splits this into appropriate steps in your series. Please check.
Note that you do not have to say "if the variable has something,
then free it". free(NU
On Wed, Jul 08, 2015 at 12:48:06AM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
> $ git am -s ./+dt
> ...
> error: patch failed: builtin/update-ref.c:421
> error: builtin/update-ref.c: patch does not apply
> Patch failed at 0007 update-ref and tag: add --create-reflog arg
> The copy of th
Junio C Hamano writes:
> Paul Tan writes:
>
>> This patch series rewrites git-am.sh into optimized C builtin/am.c, and is
>> part of my GSoC project to rewrite git-pull and git-am into C builtins[1].
>
> I merged this to 'jch' (that is somewhere in between 'next' and
> 'pu', which is what I use
On Wed, Jul 8, 2015 at 3:31 PM, Junio C Hamano wrote:
> Paul Tan writes:
>
>> This patch series rewrites git-am.sh into optimized C builtin/am.c, and is
>> part of my GSoC project to rewrite git-pull and git-am into C builtins[1].
>
> I merged this to 'jch' (that is somewhere in between 'next' an
Paul Tan writes:
> This patch series rewrites git-am.sh into optimized C builtin/am.c, and is
> part of my GSoC project to rewrite git-pull and git-am into C builtins[1].
I merged this to 'jch' (that is somewhere in between 'next' and
'pu', which is what I use for everyday work) and tried it to
On Wed, Jul 8, 2015 at 2:52 AM, Junio C Hamano wrote:
> Paul Tan writes:
>> This patch series rewrites git-am.sh into optimized C builtin/am.c, and is
>> part of my GSoC project to rewrite git-pull and git-am into C builtins[1].
>>
>> [1] https://gist.github.com/pyokagan/1b7b0d1f4dab6ba3cef1
>
>
Paul Tan writes:
> This patch series depends on pt/pull-builtin.
>
> This is a re-roll of [v4]. Thanks Torsten, Stefan, Junio for the reviews last
> round. Interdiff below.
>
> Previous versions:
>
> [WIP v1] http://thread.gmane.org/gmane.comp.version-control.git/270048
> [WIP v2] http://thread.g
This patch series depends on pt/pull-builtin.
This is a re-roll of [v4]. Thanks Torsten, Stefan, Junio for the reviews last
round. Interdiff below.
Previous versions:
[WIP v1] http://thread.gmane.org/gmane.comp.version-control.git/270048
[WIP v2] http://thread.gmane.org/gmane.comp.version-contro
12 matches
Mail list logo
