diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2015-06-18 18:38:44 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-29 13:11:37 -0700 |
| commit | d17ec3a9daffd7f525f39b52011dc653afcbd275 (patch) | |
| tree | b6d981f4a488c82a5e988265166fa9091aa2f615 /t/t4013/diff.log_--decorate=full_--all | |
| parent | Git 2.2.2 (diff) | |
| download | tgif-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 't/t4013/diff.log_--decorate=full_--all')
0 files changed, 0 insertions, 0 deletions