All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 0/2] Fix a git stash -p corner-case
Date: Wed, 08 Apr 2020 18:52:32 +0000	[thread overview]
Message-ID: <pull.602.git.1586371954.gitgitgadget@gmail.com> (raw)

This corner case came up a couple of times in my personal usage of git stash
-p: I wanted to stash only part of a split hunk, and it didn't work.

I originally intended to do a full fix (for details, see the commit message
of the second patch), but in the year since I wrote this patch pair, I found
the current work-around plenty satisfactory.

Johannes Schindelin (2):
  t3904: fix incorrect demonstration of a bug
  stash -p: (partially) fix bug concerning split hunks

 builtin/stash.c        | 2 +-
 t/t3904-stash-patch.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


base-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-602%2Fdscho%2Fstash-p-corner-case-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-602/dscho/stash-p-corner-case-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/602
-- 
gitgitgadget

             reply	other threads:[~2020-04-08 18:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-08 18:52 Johannes Schindelin via GitGitGadget [this message]
2020-04-08 18:52 ` [PATCH 1/2] t3904: fix incorrect demonstration of a bug Johannes Schindelin via GitGitGadget
2020-04-08 18:52 ` [PATCH 2/2] stash -p: (partially) fix bug concerning split hunks Johannes Schindelin via GitGitGadget

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

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

  git send-email \
    --in-reply-to=pull.602.git.1586371954.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.