git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/1] built-in stash: fix segmentation fault when files were added with intent
Date: Fri, 18 Jan 2019 01:50:15 -0800 (PST)	[thread overview]
Message-ID: <pull.110.git.gitgitgadget@gmail.com> (raw)

Git for Windows offered the built-in stash early: in v2.19.0 it was offered
as an experimental option, and in v2.20.0 it was enabled by default.

One corner case was identified
[https://github.com/git-for-windows/git/issues/2006] and fixed
[https://github.com/git-for-windows/git/pull/2008] in the meantime, and this
contribution brings it to the Git mailing list (with a commit message that
was "lightly edited for clarity", as they say).

This patch applies on top of ps/stash-in-c.

Granted, it fixes a regression in that patch series, but as Paul is busy
with University, I would suggest accepting this bug fix on top, just this
time, as if we had stash-in-c already in next.

Matthew Kraai (1):
  stash: fix segmentation fault when files were added with intent

 builtin/stash.c  | 3 ++-
 t/t3903-stash.sh | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)


base-commit: bec65d5b783ef5ce4c655c26ad8f25c04b001dd1
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-110%2Fdscho%2Fstash-ita-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-110/dscho/stash-ita-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/110
-- 
gitgitgadget

             reply	other threads:[~2019-01-18  9:50 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-18  9:50 Johannes Schindelin via GitGitGadget [this message]
2019-01-18  9:50 ` [PATCH 1/1] stash: fix segmentation fault when files were added with intent Matthew Kraai via GitGitGadget
2019-01-18 20:42   ` Junio C Hamano
2019-01-21 15:14     ` Johannes Schindelin
2019-01-22 18:33       ` Junio C Hamano
2019-01-23 11:38         ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.110.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ungureanupaulsebastian@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).