RE: Segfault on git for Windows

[Rémi Galan Alfonso]

> Hi Rémi,
> 
> On Wed, 5 Apr 2017, Rémi Galan Alfonso wrote:
> 
> > At $DAYWORK, the code is versionned under SVN. Since I haven't used SVN
> > before and try to have a clean and bisectable history, I installed git
> > with the intent to manage my code locally before pushing to SVN when I'm
> > satisfied (I haven't tries git-svn because I have never used it and
> > would like to avoid screwing up the SVN repo by some mistake).
> > 
> > So first to setup the local repo, I wanted to add all of the code files.
> > So I first ran at the root of the repo:
> >   $ git add ./**.cpp
> > Which is quite a big amount of files (partly because of external
> > dependencies which would have been smart to exclude, but it's done).
> >   $ find -type f -name "**.cpp" | wc -l
> >   8676
> > This command worked (return status is 0 and no error message).
> > 
> > However following `git add **.hpp` and `git status` segfault with no
> > additional message:
> >   $ git status
> >   Segmentation fault
> 
> I think this is the problem identified in
> https://github.com/git-for-windows/git/issues/.
> 
> To verify, you could try the snapshot (with the proposed fix) hosted here:
> http://wingit.blob.core.windows.net/files/index.html

Thanks, it fixed it. Sorry for the noise.
Rémi

Segfault on git for Windows

[Rémi Galan Alfonso]

Hello,

I am unsure whether it's Windows only or not, so I'm sending here and
CCing Dscho.

At $DAYWORK, the code is versionned under SVN. Since I haven't used
SVN before and try to have a clean and bisectable history, I installed
git with the intent to manage my code locally before pushing to SVN
when I'm satisfied (I haven't tries git-svn because I have never used
it and would like to avoid screwing up the SVN repo by some mistake).

So first to setup the local repo, I wanted to add all of the code
files. So I first ran at the root of the repo:
  $ git add ./**.cpp
Which is quite a big amount of files (partly because of external
dependencies which would have been smart to exclude, but it's
done).
  $ find -type f -name "**.cpp" | wc -l
  8676
This command worked (return status is 0 and no error message).

However following `git add **.hpp` and `git status` segfault with no
additional message:
  $ git status
  Segmentation fault
I didn't try to test other commands (`git diff --cached` works
though).

$ git --version
git version 2.12.2.windows.1

This seems to be reproducible.

Sadly I won't be able to share the repo where this happens.

FWIW:
  $ git fsck
  notice: HEAD points to an unborn branch (master)
  Checking object directories: 100% (256/256), done.
  notice: No default references

Thanks,
Rémi Galan Alfonso

Re: [PATCH 1/3] Add --gui option to mergetool

[Rémi Galan Alfonso]

Hi,

Denton Liu  writes:
> [...]
>
> +test_expect_success 'gui mergetool' '
> +  test_when_finished "git reset --hard" &&
> +  test_when_finished "git config merge.tool mytool" &&
> +  test_when_finished "git config --unset merge.guitool" &&
> +  git config merge.tool badtool &&
> +  git config merge.guitool mytool &&

You should be able to squash the lines
  `test_when_finished "git config --unset merge.guitool" &&`
and
  `git config merge.guitool mytool &&`
into
  `test_config merge.guitool mytool`

(It is however not possible with merge.tool since you set it to a
specific value 'when_finished')

Thanks,
Rémi