While fsck_walk/fsck_walk_tree/parse_tree populates "struct tree"
idempotently, it is still up to the fsck_walk caller to call
free_tree_buffer.
Fixes: ad2db4030e42890e ("fsck: remove redundant parse_tree() invocation")
Signed-off-by: Eric Wong
---
These APIs could probably be
On January 20, 2018 2:15 AM, Junio C Hamano wrote:
> "Randall S. Becker" writes:
>
> > I’m still a bit perplexed by some behaviour seen today, and am looking
> > for a clean way to deal with it that the documentation does not make
> > clear. So, I’m asking in a different
"Randall S. Becker" writes:
> I’m still a bit perplexed by some behaviour seen today, and am looking for a
> clean way to deal with it that the documentation does not make clear. So, I’m
> asking in a different way. Suppose a graph of
>
> A---B---C---D---E
> \ \
Junio C Hamano writes:
> Eric Sunshine writes:
>
>>> I'm still quite mystified as to why this is working on Linux and not
>>> macOS, but I can only guess that compilers are just very advanced and
>>> have somehow concluded that we would clearly never
I’m still a bit perplexed by some behaviour seen today, and am looking for a
clean way to deal with it that the documentation does not make clear. So, I’m
asking in a different way. Suppose a graph of
A---B---C---D---E
\ \ /
\F—G/
When trying to perform a
Somewhere between 2.13.6 & 2.14.1 there's an output regression. I
haven't done a bisect to trace it down further yet.
Specifically, --rebase --recurse-submodules=yes seems to cause --quiet
to not be effective anymore.
Full commandline:
$ git pull --rebase --recurse-submodules --quiet
In 2.13.6,
On Thu, Jan 18, 2018 at 10:36 AM, Johannes Schindelin
wrote:
> This one is a bit tricky to explain, so let's try with a diagram:
> [...]
> Signed-off-by: Johannes Schindelin
> ---
> diff --git a/builtin/rebase--helper.c
Gargi Sharma wrote:
> --- a/list.h
> +++ b/list.h
> @@ -93,6 +93,13 @@ static inline void list_move(struct list_head *elem,
> struct list_head *head)
> list_add(elem, head);
> }
>
> +/* Move to the front of the list. */
> +static inline void list_move_to_front(struct
On Fri, Jan 19, 2018 at 6:36 PM, Gargi Sharma wrote:
> Replace the custom calls to mru.[ch] with calls to list.h. This patch is
> the final step in removing the mru API completely and inlining the logic.
> This patch leads to significant code reduction and the mru API hence,
On Fri, Jan 19, 2018 at 9:19 AM, Phillip Wood wrote:
> Check that cherry-pick and rebase call the 'prepare-commit-msg' hook
> correctly. [...]
>
> Signed-off-by: Phillip Wood
> ---
> diff --git a/t/t7505-prepare-commit-msg-hook.sh
>
On Fri, Jan 19, 2018 at 7:23 PM, brian m. carlson
wrote:
> On Fri, Jan 19, 2018 at 07:15:45PM -0500, Eric Sunshine wrote:
>> Are you planning on submitting the test as a proper patch as follow-up
>> to [1]? I couldn't quite decide in which test script it should
On Fri, Jan 19, 2018 at 07:15:45PM -0500, Eric Sunshine wrote:
> Oh, I agree. My original question of its practical value was based
> upon my belief that the full test suite is very rarely run on MacOS
> (partly because there are so few Git developers on MacOS and partly
> because it runs so
On Fri, Jan 19, 2018 at 12:25 PM, Todd Zullinger wrote:
> Eric Sunshine wrote:
>> Nice detective work. This particular manifestation is caught by the
>> following test which fails without brian's patch on MacOS (and
>> presumably Windows) and succeeds with it. On Linux and BSD, it
On Fri, Jan 19, 2018 at 5:31 PM, brian m. carlson
wrote:
> On Fri, Jan 19, 2018 at 02:40:02AM -0500, Eric Sunshine wrote:
>> Nice detective work. This particular manifestation is caught by the
>> following test which fails without brian's patch on MacOS (and
>>
UNSECURED BUSINESS/PERSONAL LOAN BY LOAN CAPITAL FINANCE
- NO COLLATERAL
- MINIMUM DOCUMENTATION
- BUSINESS LOAN UP TO FIVE(5) MILLION US DOLLARS
CONTACT US TODAY VIA EMAIL: financecapital...@mail.com
---
This email has been checked for viruses by Avast antivirus
On Fri, Jan 19, 2018 at 9:46 PM, Jeff King wrote:
>
> On Mon, Jan 15, 2018 at 08:46:25PM -0500, Gargi Sharma wrote:
>
> > Replace the custom calls to mru.[ch] with calls to list.h. This patch is the
> > final step in removing the mru API completely and inlining the logic.
> >
> >
Replace the custom calls to mru.[ch] with calls to list.h. This patch is
the final step in removing the mru API completely and inlining the logic.
This patch leads to significant code reduction and the mru API hence, is
not a useful abstraction anymore.
Signed-off-by: Gargi Sharma
On January 19, 2018 5:29 PM, I wrote:
> On January 19, 2018 4:27 PM, Jeff King wrote:
> > On Fri, Jan 19, 2018 at 12:34:04PM -0500, randall.s.bec...@rogers.com
> wrote:
> >
> > > From: "Randall S. Becker"
> > >
> > > * t/lib-git-daemon.sh: fix incompatibilities with ksh
So here a bit of a nit or nano-quibble that I have. Call it my "warnings
OCD" if you want. I'm seeing an increase in the enumerated type warnings
coming from my use of the c99 compiler for compiling git over time (loads
more for 2.16.0 compared to 2.3.7 when I took it on). What is the general
On Fri, Jan 19, 2018 at 11:24:24AM -0800, Junio C Hamano wrote:
> Eric Sunshine writes:
> > Now that we know (due to Duy's excellent detective work[1]) that the
> > trigger is files with names differing only in case on case-insensitive
> > filesystems, the commit message
> -Original Message-
> From: randall.s.bec...@rogers.com [mailto:randall.s.bec...@rogers.com]
> Sent: January 19, 2018 6:00 PM
> To: git@vger.kernel.org
> Cc: Randall S. Becker
> Subject: [PATCH v3 0/6] Force pipes to flush immediately on NonStop
> platform
>
>
From: "Randall S. Becker"
* wrapper.c: called setbuf(stream,NULL) to force pipe flushes not
enabled by default on the NonStop platform. This applies only
to the NonStop platform guarded by #ifdef __TANDEM.
Signed-off-by: Randall S. Becker
---
On January 19, 2018 5:43 PM, Ramsay Jones wrote:
> On 19/01/18 21:20, Jeff King wrote:
> > On Fri, Jan 19, 2018 at 08:28:48PM +, Ramsay Jones wrote:
> >
> >>> diff --git a/remote.c b/remote.c
> >>> index 4e93753e1..c18f9de7f 100644
> >>> --- a/remote.c
> >>> +++ b/remote.c
> >>> @@ -11,6
UNSECURED BUSINESS/PERSONAL LOAN BY LOAN CAPITAL FINANCE
- NO COLLATERAL
- MINIMUM DOCUMENTATION
- BUSINESS LOAN UP TO FIVE(5) MILLION US DOLLARS
CONTACT US TODAY VIA EMAIL: financecapital...@mail.com
---
This email has been checked for viruses by Avast antivirus
On 19/01/18 21:20, Jeff King wrote:
> On Fri, Jan 19, 2018 at 08:28:48PM +, Ramsay Jones wrote:
>
>>> diff --git a/remote.c b/remote.c
>>> index 4e93753e1..c18f9de7f 100644
>>> --- a/remote.c
>>> +++ b/remote.c
>>> @@ -11,6 +11,10 @@
>>> #include "mergesort.h"
>>> #include "argv-array.h"
On January 19, 2018 3:29 PM, Ramsay Jones wrote:
> On 19/01/18 17:34, randall.s.bec...@rogers.com wrote:
> > From: "Randall S. Becker"
> >
> > * remote.c: force ignoring of GCC __attribute construct not supported
> > by c99 by defining it as an empty CPP macro.
> >
> >
On Fri, Jan 19, 2018 at 02:40:02AM -0500, Eric Sunshine wrote:
> Nice detective work. This particular manifestation is caught by the
> following test which fails without brian's patch on MacOS (and
> presumably Windows) and succeeds with it. On Linux and BSD, it will of
> course succeed always, so
On January 19, 2018 4:27 PM, Jeff King wrote:
> On Fri, Jan 19, 2018 at 12:34:04PM -0500, randall.s.bec...@rogers.com wrote:
>
> > From: "Randall S. Becker"
> >
> > * t/lib-git-daemon.sh: fix incompatibilities with ksh traps not being
> > cleared automatically on
Eric Sunshine writes:
> On Fri, Jan 19, 2018 at 2:24 PM, Junio C Hamano wrote:
>> Eric Sunshine writes:
>>> Now that we know (due to Duy's excellent detective work[1]) that the
>>> trigger is files with names differing only
Jeff King writes:
> On Thu, Jan 18, 2018 at 02:38:41PM +0100, Mathias Rav wrote:
>
>> Running git clone --single-branch --mirror -b TAGNAME previously
>> triggered the following error message:
>>
>> fatal: multiple updates for ref 'refs/tags/TAGNAME' not allowed.
>>
>> This
Thomas Gummerer writes:
> read_cache_from() defaults to using the gitdir of the_repository. As it
> is mostly a convenience macro, having to pass get_git_dir() for every
> call seems overkill, and if necessary users can have more control by
> using read_index_from().
This
On Fri, Jan 19, 2018 at 01:20:41PM -0800, Junio C Hamano wrote:
> > Documentation/merge-config.txt | 4 ++
> > builtin/merge.c| 2 +
> > A+x t/t5573-pull-verify-signatures.sh | 81
> > t/t7612-merge-verify-signatures.sh | 45
On Fri, Jan 19, 2018 at 07:26:28AM +0700, Duy Nguyen wrote:
> > (I know this is a bikeshed, so I'm perfectly willing to take "yuck, I
> > don't like that as well" as a response).
>
> The position of A+x column is exactly where gerrit put it. Though web
> pages have more flexibility than our
On Fri, Jan 19, 2018 at 2:24 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>> Now that we know (due to Duy's excellent detective work[1]) that the
>> trigger is files with names differing only in case on case-insensitive
>> filesystems, the commit
On Mon, Jan 15, 2018 at 08:46:25PM -0500, Gargi Sharma wrote:
> Replace the custom calls to mru.[ch] with calls to list.h. This patch is the
> final step in removing the mru API completely and inlining the logic.
>
> Another discussion, here
>
On Thu, Jan 18, 2018 at 04:45:05PM +0700, Nguyễn Thái Ngọc Duy wrote:
> v6 squashes Junio's changes in 6/7 and moves trace_run_command() from
> trace.c to run-command.c.
Thanks, this version looks good to me.
-Peff
On Fri, Jan 19, 2018 at 12:34:04PM -0500, randall.s.bec...@rogers.com wrote:
> From: "Randall S. Becker"
>
> * t/lib-git-daemon.sh: fix incompatibilities with ksh traps not being
> cleared automatically on platform. This caused tests to seem to fail
> while actually
Nguyễn Thái Ngọc Duy writes:
> Documentation/merge-config.txt | 4 +
> builtin/merge.c| 2 +
>A t/t5573-pull-verify-signatures.sh | 81 ++
> t/t7612-merge-verify-signatures.sh | 45 ++
>4 files changed, 132
On Fri, Jan 19, 2018 at 08:28:48PM +, Ramsay Jones wrote:
> > diff --git a/remote.c b/remote.c
> > index 4e93753e1..c18f9de7f 100644
> > --- a/remote.c
> > +++ b/remote.c
> > @@ -11,6 +11,10 @@
> > #include "mergesort.h"
> > #include "argv-array.h"
> >
> > +#if defined (__TANDEM)
> >
On 01/19, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Friendly ping on this series now that 2.16 is out :) Is there anything
> > in this series (up to 3/3, 4/3 can be dropped now that Duy fixed it in
> > a nicer way) that still needs updating? It fixes a few bugs
Nguyễn Thái Ngọc Duy writes:
> The call invalidate_directory() between opendir() and warning_errno() in
> theory could make some system calls and change errno. Prevent that by
> warning immediately after opendir().
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
>
Christian Couder writes:
> On Tue, Jan 16, 2018 at 2:46 AM, Gargi Sharma wrote:
>> Replace the custom calls to mru.[ch] with calls to list.h. This patch is the
>> final step in removing the mru API completely and inlining the logic.
>
> You might
Johannes Schindelin writes:
> Good idea! I would rather do it as an introductory patch (that only
> converts the existing list).
>
> As to `merge`: it is a bit more complicated ;-)
>
> m, merge ( | "..." ) []
> create a merge commit using the
On 19/01/18 17:34, randall.s.bec...@rogers.com wrote:
> From: "Randall S. Becker"
>
> * remote.c: force ignoring of GCC __attribute construct not supported
> by c99 by defining it as an empty CPP macro.
>
> Signed-off-by: Randall S. Becker
>
Johannes Schindelin writes:
> Think of --recreate-merges as "--preserve-merges done right". It
> introduces new verbs for the todo list, `label`, `reset` and `merge`.
> For a commit topology like this:
>
> A - B - C
> \ /
>
On Fri, Jan 19, 2018 at 10:47:57AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > I also think %(deltabase) does make sense for anything that points to an
> > object. I suspect it's not all that _useful_ for for-each-ref, but that
> > doesn't mean we can't return the
On Fri, Jan 19, 2018 at 9:34 AM, wrote:
> From: "Randall S. Becker"
>
> * t/lib-git-daemon.sh: fix incompatibilities with ksh traps not being
> cleared automatically on platform.
Which platform? Do we need to guard it for other platforms?
On Fri, Jan 19, 2018 at 9:33 AM, wrote:
> From: "Randall S. Becker"
>
> * wrapper.c: called setbuf(stream,0) to force pipe flushes not enabled by
> default on the NonStop platform.
>
Due to my review of a previous patch, I now know about
On Fri, Jan 19, 2018 at 9:34 AM, wrote:
> From: "Randall S. Becker"
>
> * remote.c: force ignoring of GCC __attribute construct not supported
> by c99 by defining it as an empty CPP macro.
>
> Signed-off-by: Randall S. Becker
Eric Sunshine writes:
>> I'm still quite mystified as to why this is working on Linux and not
>> macOS, but I can only guess that compilers are just very advanced and
>> have somehow concluded that we would clearly never dereference a NULL
>> pointer, so they picked the
SZEDER Gábor writes:
> Junio,
> ...
> This patch can't be applied to 'maint' currently at 3013dff86 (Prepare
> for 2.15.2, 2017-12-06), as it is in case of 'ds/use-get-be64',
> because 'maint' doesn't have get_be64() yet (b2e39d006 (bswap: add 64
> bit endianness helper
Christoph Hellwig writes:
> [adding Chris to the Cc list - this is about the awful ext3 data=ordered
> behavior of syncing the whole file system data and metadata on each
> fsync]
>
> On Wed, Jan 17, 2018 at 03:57:53PM -0800, Linus Torvalds wrote:
>> On Wed, Jan 17, 2018 at 3:52 PM,
On Fri, Jan 19, 2018 at 10:55 AM, Phillip Wood
wrote:
> On 19/01/18 12:24, Phillip Wood wrote:
>>
>> On 18/01/18 15:35, Johannes Schindelin wrote:
>>>
>>> Internally, the `label ` command creates the ref
>>> `refs/rewritten/`. This makes it possible to work with the
On 19/01/18 12:24, Phillip Wood wrote:
>
> On 18/01/18 15:35, Johannes Schindelin wrote:
>>
>> Internally, the `label ` command creates the ref
>> `refs/rewritten/`. This makes it possible to work with the labeled
>> revisions interactively, or in a scripted fashion (e.g. via the todo
>> list
Jeff King writes:
> I also think %(deltabase) does make sense for anything that points to an
> object. I suspect it's not all that _useful_ for for-each-ref, but that
> doesn't mean we can't return the sensible thing if somebody asks for it.
This may not be a new issue (or any
On Fri, Jan 19, 2018 at 12:51:52PM -0500, Robert P. J. Day wrote:
>
> just finished teaching a couple git courses and, after class, a
> student came up and described a rather weird problem -- in short:
>
> 1) before build, "git diff" shows nothing
> 2) do the standard build
> 3)
On Fri, Jan 19, 2018 at 12:51:52PM -0500, Robert P. J. Day wrote:
> that's all the info i was given, but it *seems* clear that the build
> process itself was making changes to one or more tracked files.
>
> technically, i guess one can design a build system to do pretty
> much anything, but is
Thomas Gummerer writes:
> Friendly ping on this series now that 2.16 is out :) Is there anything
> in this series (up to 3/3, 4/3 can be dropped now that Duy fixed it in
> a nicer way) that still needs updating? It fixes a few bugs in split
> index mode with
On Fri, Jan 19, 2018 at 01:22:04PM -0500, Todd Zullinger wrote:
This seems likely to be the same segfault as:
https://public-inbox.org/git/calwadsgfb10f5+nofn-phct4z1skwmcvshn8kokcycm0v6k...@mail.gmail.com/
There's a patch in that thread.
I've verified that the patch fixes my case.
I'll
On Tue, Jan 16, 2018 at 2:46 AM, Gargi Sharma wrote:
> Replace the custom calls to mru.[ch] with calls to list.h. This patch is the
> final step in removing the mru API completely and inlining the logic.
You might want to say that this provides a significant code reduction
Hi Stephen,
Stephen M. McQuay wrote:
> I submitted a bug against the brew project when git
> version 2.16.0 started segfaulting:
>
> https://github.com/Homebrew/homebrew-core/issues/23045#issuecomment-358891009
This seems likely to be the same segfault as:
I submitted a bug against the brew project when git version 2.16.0
started segfaulting:
https://github.com/Homebrew/homebrew-core/issues/23045#issuecomment-358891009
I've built git from master from https://github.com/git/git and was able
to reproduce (no surprise, the top commit claims it's
On January 19, 2018 12:52 PM, Robert P. J. Day wrote:
> just finished teaching a couple git courses and, after class, a student
came
> up and described a rather weird problem -- in short:
>
> 1) before build, "git diff" shows nothing
> 2) do the standard build
> 3) suddenly, "git diff"
On Fri, Jan 19, 2018 at 6:22 PM, Оля Тележная wrote:
> 2018-01-19 20:14 GMT+03:00 Christian Couder :
>> On Thu, Jan 18, 2018 at 7:20 AM, Оля Тележная
>> wrote:
>>> And another thoughts here - we were thinking about
Am 18.01.2018 um 23:40 schrieb SZEDER Gábor:
> On Thu, Jan 18, 2018 at 10:40 PM, René Scharfe wrote:
>> Am 16.01.2018 um 18:11 schrieb SZEDER Gábor:
>>> Unfortunately, most of the changes coming from 'strbuf.cocci' don't
>>> make any sense, they appear to be the mis-application of
just finished teaching a couple git courses and, after class, a
student came up and described a rather weird problem -- in short:
1) before build, "git diff" shows nothing
2) do the standard build
3) suddenly, "git diff" shows some changes
that's all the info i was given, but it *seems*
From: "Randall S. Becker"
* config.mak.uname: upgrade old options to currently supported
NonStop operating system versions (J06.21 and L17.xx).
Signed-off-by: Randall S. Becker
---
config.mak.uname | 29 +
1 file
From: "Randall S. Becker"
* t/lib-git-daemon.sh: fix incompatibilities with ksh traps not being
cleared automatically on platform. This caused tests to seem to fail
while actually succeeding.
Signed-off-by: Randall S. Becker
---
From: "Randall S. Becker"
* compat/regex/regcomp.c: fix missing intptr_t on NonStop. This is
done because git-compat-util.h cannot be cleanly included into
this file without additional compile errors.
Signed-off-by: Randall S. Becker
---
From: "Randall S. Becker"
* Makefile: Add TAR_EXTRACT_OPTIONS to allow platform options to be
specified if needed. The default is xof.
Signed-off-by: Randall S. Becker
---
Makefile | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
From: "Randall S. Becker"
* wrapper.c: called setbuf(stream,0) to force pipe flushes not enabled by
default on the NonStop platform.
Signed-off-by: Randall S. Becker
---
wrapper.c | 3 +++
1 file changed, 3 insertions(+)
diff --git
From: "Randall S. Becker"
* git-compat-util.h: add correct FLOSS definitions to allow correct
emulation of non-platform behaviour. Add NSIG definition that is
not explicitly supplied in signal.h on platform.
Signed-off-by: Randall S. Becker
From: "Randall S. Becker"
This is the second attempt at submission of the NonStop port to
the git team. This package is split by file but should be applied
atomically.
I am not happy with the change in compat/regex/regcomp.c and figure
this might change with feedback.
From: "Randall S. Becker"
* remote.c: force ignoring of GCC __attribute construct not supported
by c99 by defining it as an empty CPP macro.
Signed-off-by: Randall S. Becker
---
remote.c | 4
1 file changed, 4 insertions(+)
diff --git
On Fri, Jan 19, 2018 at 6:23 PM, Jeff King wrote:
> On Fri, Jan 19, 2018 at 06:14:56PM +0100, Christian Couder wrote:
>
>> > Let's discuss, what behavior we are waiting for
>> > when atom seems useless for the command. Die or ignore?
>>
>> We could alternatively just emit a
Eric Sunshine wrote:
> Nice detective work. This particular manifestation is caught by the
> following test which fails without brian's patch on MacOS (and
> presumably Windows) and succeeds with it. On Linux and BSD, it will of
> course succeed always, so I'm not sure how much practical value it
On Fri, Jan 19, 2018 at 06:14:56PM +0100, Christian Couder wrote:
> > Let's discuss, what behavior we are waiting for
> > when atom seems useless for the command. Die or ignore?
>
> We could alternatively just emit a warning, but it looks like there
> are a lot of die() calls already in
2018-01-19 20:14 GMT+03:00 Christian Couder :
> On Thu, Jan 18, 2018 at 7:20 AM, Оля Тележная
> wrote:
>> 2018-01-18 1:39 GMT+03:00 Christian Couder :
>>> On Wed, Jan 17, 2018 at 10:43 PM, Jeff King
United Nations Compensation Unit, Emergency Relief Coordinator, United Nations.
Congratulations Beneficiary,
We have been having a meeting for quit sometime now and we just came to a
logical conclusion 72 hours ago in affiliation with the World Bank president.
Your email was listed
On Thu, Jan 18, 2018 at 7:20 AM, Оля Тележная wrote:
> 2018-01-18 1:39 GMT+03:00 Christian Couder :
>> On Wed, Jan 17, 2018 at 10:43 PM, Jeff King wrote:
>>> On Tue, Jan 16, 2018 at 09:55:22AM +0300, Оля Тележная wrote:
>>>
There's a rule in strbuf.cocci for converting trivial uses of
strbuf_addf() to strbuf_addstr() in order to simplify the code and
improve performance a bit. Coccinelle 1.0.0~rc19.deb-3 on Travis CI
lets the "%s" in that rule match format strings like "%d" as well for
some reason, though, leading
Seeking your kind assistance
---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
-- Forwarded message --
From: "A. ALLIED"
Date: Fri, 19 Jan 2018 15:44:47 +
Subject:
To:
Hi.docx
Description: MS-Word 2007 document
On Fri, Jan 19, 2018 at 1:24 PM, Оля Тележная wrote:
> 2018-01-18 17:23 GMT+03:00 Christian Couder :
>> On Thu, Jan 18, 2018 at 12:49 PM, Оля Тележная
>> wrote:
>>> 2018-01-18 9:20 GMT+03:00 Оля Тележная
Hello Dear,
Compliment of the season, I have an urgent Business Transaction for you kindly
contact me through my Google email: mrsjanezh...@gmail.com
for more details.
Happy New Year
Mrs Lin.
On 18/01/18 15:35, Johannes Schindelin wrote:
>
> Just like with regular `pick` commands, if we are trying to recreate a
> merge commit, we now test whether the parents of said commit match HEAD
> and the commits to be merged, and fast-forward if possible.
>
> This is not only faster, but also
On 18/01/18 15:35, Johannes Schindelin wrote:
>
> This patch is part of the effort to reimplement `--preserve-merges` with
> a substantially improved design, a design that has been developed in the
> Git for Windows project to maintain the dozens of Windows-specific patch
> series on top of
From: Phillip Wood
These two patches add some tests and fix the sequencer to run the
'prepare-commit-msg' hook when committing without forking 'git commit'
Phillip Wood (2):
t7505: Add tests for cherry-pick and rebase -i/-p
sequencer: run 'prepare-commit-msg'
From: Phillip Wood
Check that cherry-pick and rebase call the 'prepare-commit-msg' hook
correctly. The expected values for the hook arguments are taken to
match the current master branch. I think there is scope for improving
the arguments passed so they make a bit
From: Phillip Wood
Commit 356ee4659b ("sequencer: try to commit without forking 'git
commit'", 2017-11-24) forgot to run the 'prepare-commit-msg' hook when
creating the commit. Fix this by writing the commit message to a
different file and running the hook. Using a
Git has a diff.wordRegex config that allows the user to specify a
regex that defines a word. Setting diff.wordRegex to "." works well
for a char-level diff for ASCII chars, but not for UTF-8 chars.
For example, if a file (encoded by UTF-8) with text "一人" is changed to
"丁人", "git diff
On 18/01/18 15:35, Johannes Schindelin wrote:
>
> In the upcoming commits, we will teach the sequencer to recreate merges.
> This will be done in a very different way from the unfortunate design of
> `git rebase --preserve-merges` (which does not allow for reordering
> commits, or changing the
2018-01-18 17:23 GMT+03:00 Christian Couder :
> On Thu, Jan 18, 2018 at 12:49 PM, Оля Тележная
> wrote:
>> 2018-01-18 9:20 GMT+03:00 Оля Тележная :
>>>
>>> I think it's important to finish migrating process at first.
On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin
wrote:
> [...]
> With this patch, the goodness of the Git garden shears comes to `git
> rebase -i` itself. Passing the `--recreate-merges` option will generate
> a todo list that can be understood readily, and where
On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin
wrote:
> The sequencer just learned a new commands intended to recreate branch
s/a //
> structure (similar in spirit to --preserve-merges, but with a
> substantially less-broken design).
> [...]
> Signed-off-by:
On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin
wrote:
> [...]
> Note: this patch only adds support for recursive merges, to keep things
> simple. Support for octopus merges will be added later in this patch
> series, support for merges using strategies other
On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin
wrote:
> [...]
> This commit implements the commands to label, and to reset to, given
> revisions. The syntax is:
>
> label
> reset
> [...]
>
> Signed-off-by: Johannes Schindelin
On Fri, Jan 19, 2018 at 3:22 AM, Duy Nguyen wrote:
> On Fri, Jan 19, 2018 at 2:40 PM, Eric Sunshine
> wrote:
>> On Fri, Jan 19, 2018 at 12:31:58PM +0700, Duy Nguyen wrote:
>>> On Linux, after I hacked all over the place to force ce_match_stat()
>>> to
On Fri, Jan 19, 2018 at 2:40 PM, Eric Sunshine wrote:
> On Fri, Jan 19, 2018 at 12:31:58PM +0700, Duy Nguyen wrote:
>> On Fri, Jan 19, 2018 at 10:40 AM, brian m. carlson
>> > I'm still extremely puzzled as to why this doesn't fail on Linux. If
>> > it's failing in this
99 matches
Mail list logo