Junio C Hamano <junkio@xxxxxxx> writes: > ebiederm@xxxxxxxxxxxx (Eric W. Biederman) writes: > >> After fixing it up and doing all of my edits I occasionally forget >> the git-update-index step, before calling git-am --resolved. This >> proceeds along it's merry way and creates an empty commit. > > Certainly a safty measure is missing here. Thanks for > noticing. How about something like this? Just tested it the patch works, at least in my simple contrived example :) Is this something that we always want to test for in the porcelain or do we want to move a check into git-commit-tree? For getting a reasonable error message where you have the test seems to be the only sane place, but having the check deeper down would be more likely to catch this kind of thing. Eric - : 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