Junio C Hamano <gitster@xxxxxxxxx> writes: > Phil Hord <hordp@xxxxxxxxx> writes: > >> In git.git 'master' when I cherry-pick a commit which is eventually >> empty, git gives me a friendly description of my supposed error, leaves >> my cherry-pick "pending" and exits with an error code. >> >> >> $ git cherry-pick a0aff2d >> # On branch master >> nothing to commit (working directory clean) >> The previous cherry-pick is now empty, possibly due to conflict resolution. >> If you wish to commit it anyway, use: >> >> git commit --allow-empty >> >> Otherwise, please use 'git reset' >> >> In 'next' this is broken. Now git does not tell me anything and it does >> not exit with an error code. > > ... The test > t3505.2 is about failing an attempt to cherry-pick an empty commit: Ahh, disregard that one. It is not testing the case where a cherry-pick results in empty. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html