]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b4967ab) | patch
t4150: am --resolved fails if index has no changes
authorPaul Tan <pyokagan@gmail.com>
Sun, 19 Jul 2015 15:49:11 +0000 (23:49 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Jul 2015 17:51:47 +0000 (10:51 -0700)
commit60ff7f9f5c818d1e59daa47467c61ad53be2c5ec
tree45bc69febc1a2bed1f578a094530b8139e8ccc27tree | snapshot
parentb4967ab49003e78bc4555de686a20bc82d56614fcommit | diff
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>
t/t4150-am.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.