summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2015-06-18 18:38:44 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-29 13:11:37 -0700
commitd17ec3a9daffd7f525f39b52011dc653afcbd275 (patch)
treeb6d981f4a488c82a5e988265166fa9091aa2f615 /pretty.c
parentGit 2.2.2 (diff)
downloadtgif-d17ec3a9daffd7f525f39b52011dc653afcbd275.tar.xz
t3404: demonstrate CHERRY_PICK_HEAD bug
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>
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions