| commit | ab156128fa0e3fc70a40f367abdf3f601c3ba611 | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Sun, 19 Jul 2015 15:49:08 +0000 (19 23:49 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Jul 2015 17:51:02 +0000 (20 10:51 -0700) | ||
| tree | 9f29e4c2bd511c52c69a07868d2eca63c390f749 | treesnapshot (tar.gz zip) |
| parent | 8528bf4b89650dc7312ae48f32dac3f1c7ab9a65 | commitdiff |
t4150: am fails if index is dirty
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am
will ensure that the index is clean before applying the patch. This is
to prevent changes unrelated to the patch from being committed.
Add a test for this check.
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 d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am
will ensure that the index is clean before applying the patch. This is
to prevent changes unrelated to the patch from being committed.
Add a test for this check.
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/t4150-am.sh | diffblobblamehistory |