name-rev: include taggerdate in considering the best name

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 8c5de4c1ebb327b806999f391ef79644d8066e38..0564ad41f2ef00f8c74a35e29ad5fb725988054c 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -849,7 +849,11 @@ continue)
        # do we have anything to commit?
        if git diff-index --cached --quiet HEAD --
        then
-               : Nothing to commit -- skip this
+               # Nothing to commit -- skip this commit
+
+               test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
+               rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
+               die "Could not remove CHERRY_PICK_HEAD"
        else
                if ! test -f "$author_script"
                then