diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-07-19 17:49:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-20 19:51:18 +0200 |
| commit | 528484c6450877ecf3eaa09ed7eb2c583c75f378 (patch) | |
| tree | ff9d5c6b48b9288a9f2d75019215af82c601717f /t/t4150-am.sh | |
| parent | t4150: am fails if index is dirty (diff) | |
| download | git-528484c6450877ecf3eaa09ed7eb2c583c75f378.tar.xz git-528484c6450877ecf3eaa09ed7eb2c583c75f378.zip | |
t4151: am --abort will keep dirty index intact
Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure
and warn, 2010-12-21), git-am --abort will not touch the index if on the
previous invocation, git-am failed because the index is dirty. This is
to ensure that the user's modifications to the index are not discarded.
Add a test for this.
Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4150-am.sh')
0 files changed, 0 insertions, 0 deletions