| commit | 528484c6450877ecf3eaa09ed7eb2c583c75f378 | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Sun, 19 Jul 2015 15:49:09 +0000 (19 23:49 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Jul 2015 17:51:18 +0000 (20 10:51 -0700) | ||
| tree | ff9d5c6b48b9288a9f2d75019215af82c601717f | treesnapshot (tar.gz zip) |
| parent | ab156128fa0e3fc70a40f367abdf3f601c3ba611 | commitdiff |
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>
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>
| t/t4151-am-abort.sh | diffblobblamehistory |