Revision d17ec3a9daffd7f525f39b52011dc653afcbd275 authored by Johannes Schindelin on 18 June 2015, 16:38:44 UTC, committed by Junio C Hamano on 29 June 2015, 20:11:37 UTC
When rev-list's --cherry option does not detect that a patch has already been applied upstream, an interactive rebase would offer to reapply it and consequently stop at that patch with a failure, mentioning that the diff is empty. Traditionally, a `git rebase --continue` simply skips the commit in such a situation. However, as pointed out by Gábor Szeder, this leaves a CHERRY_PICK_HEAD behind, making the Git prompt believe that a cherry pick is still going on. This commit adds a test case demonstrating this bug. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fdf96a2
| File | Mode | Size |
|---|---|---|
| add-comments | -rwxr-xr-x | 88 bytes |
| add-content | -rwxr-xr-x | 47 bytes |
| add-content-and-comment | -rwxr-xr-x | 73 bytes |
| add-signed-off | -rwxr-xr-x | 63 bytes |
| add-whitespaced-content | -rwxr-xr-x | 76 bytes |
| edit-content | -rwxr-xr-x | 77 bytes |
Computing file changes ...
