diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:06 -0700 |
| commit | e81ecff10a19acea0bf58a260e919b1920925108 (patch) | |
| tree | 5fb4f0fcd7df32cac63676d32b87b5b38bfe7637 /t | |
| parent | Merge branch 'dl/libify-a-few' (diff) | |
| parent | stash -p: (partially) fix bug concerning split hunks (diff) | |
| download | tgif-e81ecff10a19acea0bf58a260e919b1920925108.tar.xz | |
Merge branch 'js/stash-p-fix'
Allowing the user to split a patch hunk while "git stash -p" does
not work well; a band-aid has been added to make this (partially)
work better.
* js/stash-p-fix:
stash -p: (partially) fix bug concerning split hunks
t3904: fix incorrect demonstration of a bug
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3904-stash-patch.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh index 9546b6f8a4..accfe3845c 100755 --- a/t/t3904-stash-patch.sh +++ b/t/t3904-stash-patch.sh @@ -89,7 +89,7 @@ test_expect_success 'none of this moved HEAD' ' verify_saved_head ' -test_expect_failure 'stash -p with split hunk' ' +test_expect_success 'stash -p with split hunk' ' git reset --hard && cat >test <<-\EOF && aaa @@ -106,8 +106,8 @@ test_expect_failure 'stash -p with split hunk' ' ccc EOF printf "%s\n" s n y q | - test_might_fail git stash -p 2>error && - ! test_must_be_empty error && + git stash -p 2>error && + test_must_be_empty error && grep "added line 1" test && ! grep "added line 2" test ' |