| commit | 60ff7f9f5c818d1e59daa47467c61ad53be2c5ec | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Sun, 19 Jul 2015 15:49:11 +0000 (19 23:49 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Jul 2015 17:51:47 +0000 (20 10:51 -0700) | ||
| tree | 45bc69febc1a2bed1f578a094530b8139e8ccc27 | treesnapshot (tar.gz zip) |
| parent | b4967ab49003e78bc4555de686a20bc82d56614f | commitdiff |
t4150: am --resolved fails if index has no changes
Since 6d28644 (git-am: do not allow empty commits by mistake.,
2006-02-23), git-am --resolved will check to see if the index has any
changes to prevent the user from creating an empty commit by mistake.
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 6d28644 (git-am: do not allow empty commits by mistake.,
2006-02-23), git-am --resolved will check to see if the index has any
changes to prevent the user from creating an empty commit by mistake.
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/t4150-am.sh | diffblobblamehistory |