cherry-pick: demonstrate a segmentation fault
In https://github.com/git-for-windows/git/issues/952, a complicated scenario was described that leads to a segmentation fault in cherry-pick. It boils down to a certain code path involving a renamed file that is dirty, for which `refresh_cache_entry()` returns `NULL`, and that `NULL` not being handled properly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 26, 2016 at 13:48 UTC
05f2dfb965476a59050b7c3446b1281bdcac7051
1 file changed
+12
t/t3501-revert-cherry-pick.sh
+12
@@ -141,4 +141,16 @@ test_expect_success 'cherry-pick "-" works with arguments' '
141
test_cmp expect actual
142
'
143
144
+test_expect_failure 'cherry-pick works with dirty renamed file' '
145
+ test_commit to-rename &&
146
+ git checkout -b unrelated &&
147
+ test_commit unrelated &&
148
+ git checkout @{-1} &&
149
+ git mv to-rename.t renamed &&
150
+ test_tick &&
151
+ git commit -m renamed &&
152
+ echo modified >renamed &&
153
+ git cherry-pick refs/heads/unrelated
154
+'
155
+
156
test_done