Skip to content

Fix a git stash -p corner-case

Johannes Schindelin via GitGitGadget git 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2t3904: fix incorrect demonstration of a bugt/t3904-stash-patch.sh+2 -20 replies
2/2stash -p: (partially) fix bug concerning split hunksbuiltin/stash.c t/t3904-stash-patch.sh+2 -20 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] Fix a git stash -p corner-case

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

Signature · 1 line
gitgitgadget

Read the cover letter in its thread